From patchwork Fri Nov 27 17:03:22 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dodji Seketeli <dodji@redhat.com>
X-Patchwork-Id: 41217
Return-Path: <libabigail-bounces@sourceware.org>
X-Original-To: patchwork@sourceware.org
Delivered-To: patchwork@sourceware.org
Received: from server2.sourceware.org (localhost [IPv6:::1])
	by sourceware.org (Postfix) with ESMTP id 18CDB3857026;
	Fri, 27 Nov 2020 17:06:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18CDB3857026
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1606496775;
	bh=e3UoGFGHMfpb8HAX9kWM2SR4wOC02xiD5pFGJMBpxfQ=;
	h=To:Subject:References:Date:In-Reply-To:List-Id:List-Unsubscribe:
	 List-Archive:List-Help:List-Subscribe:From:Reply-To:From;
	b=TjJSFshyCjha/0jtGYdKWjscLVPKHs/3rmC9IvR53fzPqY3FIgT4byeMB8jg7A2ou
	 IonFMofjp/B1vfjjqjz09vr07flw0PDsTkLB12uyUENotx9o7uuqyFn7SLXJCUZ59O
	 F6Kgv1tGaG2SVN6GwtokhnCEwu4aQSRDGZ2FDq+Q=
X-Original-To: libabigail@sourceware.org
Delivered-To: libabigail@sourceware.org
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [63.128.21.124])
 by sourceware.org (Postfix) with ESMTP id AC6E23858026
 for <libabigail@sourceware.org>; Fri, 27 Nov 2020 17:04:23 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AC6E23858026
Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com
 [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-276-EzrBXMxkOVGpafLbnQ3CaA-1; Fri, 27 Nov 2020 12:04:00 -0500
X-MC-Unique: EzrBXMxkOVGpafLbnQ3CaA-1
Received: by mail-wr1-f72.google.com with SMTP id w17so3668234wrp.11
 for <libabigail@sourceware.org>; Fri, 27 Nov 2020 09:04:00 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:organization:references:date
 :in-reply-to:message-id:user-agent:mime-version;
 bh=e3UoGFGHMfpb8HAX9kWM2SR4wOC02xiD5pFGJMBpxfQ=;
 b=K5e0Rccrrvby0iZXu4+134rgfdloyr8yF99MeXm16VRpbeQnSXEDWAExlPWprbKKwT
 bDLr3yEAiZfix7Gmdm6Ln61OT+GxKhIEQ9OuacPaV7yjzw0/CLxJunEIGLImYnY2L8RO
 0c5TsL8cvttZejubbQGPyizv9Cakg3jvgKsHjtWyZAm/NoI2jH4owEhzxpSSxzH9TYeU
 NIEPLn/O10q6MjYqFr4Yf1VBFvJTeoLHGz1yVQW0KPw3Ev1o5o4g29irRh2U/K3Iqevb
 /2oPNFblBY/4C4mWO6557v1VUbyGDWkt8aZqzoPXuQBYzKEDAo1Uuj95vrMDfjwV+JPQ
 06sA==
X-Gm-Message-State: AOAM5336XnjKYvqGaJsj2MCR4vQ/jq7mjr8X2azI2O3+yzcdq5tcXXMv
 sXpfkhdN4ZdpRd3m7vZ2KQfuniPF5mSB+BzuQZRaYRc0M8tskYKb/tiq9Hi8HBTVyB8VvwoUyJj
 GWn9a8ccFeet4m5aKgjHN
X-Received: by 2002:adf:fe0f:: with SMTP id
 n15mr11675310wrr.357.1606496637626;
 Fri, 27 Nov 2020 09:03:57 -0800 (PST)
X-Google-Smtp-Source: 
 ABdhPJz4w3Ze2xg4BX4gc9LxMFLqew3LOe1XmgF2MvU3fHNijb8+PqjjQ4Ojxt1totk1liM60SwuMw==
X-Received: by 2002:adf:fe0f:: with SMTP id
 n15mr11675255wrr.357.1606496637066;
 Fri, 27 Nov 2020 09:03:57 -0800 (PST)
Received: from localhost (91-166-131-65.subs.proxad.net. [91.166.131.65])
 by smtp.gmail.com with ESMTPSA id f5sm15445218wmj.17.2020.11.27.09.03.24
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 27 Nov 2020 09:03:53 -0800 (PST)
Received: by localhost (Postfix, from userid 1000)
 id 367375802B4; Fri, 27 Nov 2020 18:03:23 +0100 (CET)
To: libabigail@sourceware.org
Subject: [PATCH 1/6] writer: Emit definitions of declarations when they are
 present
Organization: Red Hat / France
References: <87h7pa7n8c.fsf@redhat.com>
X-Operating-System: Fedora 34
X-URL: http://www.redhat.com
Date: Fri, 27 Nov 2020 18:03:22 +0100
In-Reply-To: <87h7pa7n8c.fsf@redhat.com> (Dodji Seketeli's message of "Fri, 27
 Nov 2020 17:56:03 +0100")
Message-ID: <87czzy7mw5.fsf@redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, GIT_PATCH_0,
 RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, SPF_HELO_NONE, SPF_PASS,
 TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: libabigail@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Mailing list of the Libabigail project <libabigail.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libabigail/>
List-Help: <mailto:libabigail-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libabigail>,
 <mailto:libabigail-request@sourceware.org?subject=subscribe>
X-Patchwork-Original-From: Dodji Seketeli via Libabigail
 <libabigail@sourceware.org>
From: Dodji Seketeli <dodji@redhat.com>
Reply-To: Dodji Seketeli <dodji@redhat.com>
Errors-To: libabigail-bounces@sourceware.org
Sender: "Libabigail" <libabigail-bounces@sourceware.org>

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'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void __interceptor__exit(int) -->
     <function-decl name='__interceptor__exit' mangled-name='_exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_exit'>
       <!-- 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>
@@ -20854,7 +20863,7 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <!-- char** -->
       <return type-id='type-id-130'/>
     </function-decl>
@@ -20863,41 +20872,41 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigprocmask(int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigprocmask' mangled-name='__interceptor_sigprocmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigprocmask'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-10' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigpending(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigpending' mangled-name='sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigpending'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigfillset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigfillset' mangled-name='sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigfillset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigemptyset(__sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigemptyset' mangled-name='__interceptor_sigemptyset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigemptyset'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigtimedwait(__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
     <function-decl name='__interceptor_sigtimedwait' mangled-name='__interceptor_sigtimedwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigtimedwait'>
@@ -20908,7 +20917,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigwaitinfo(__sanitizer::__sanitizer_sigset_t*, void*) -->
     <function-decl name='__interceptor_sigwaitinfo' mangled-name='sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigwaitinfo'>
@@ -20917,7 +20926,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigwait(__sanitizer::__sanitizer_sigset_t*, int*) -->
     <function-decl name='__interceptor_sigwait' mangled-name='__interceptor_sigwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwait'>
@@ -20926,7 +20935,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='sig' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_wordexp(char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
     <function-decl name='__interceptor_wordexp' mangled-name='__interceptor_wordexp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wordexp'>
@@ -20935,9 +20944,9 @@
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
       <parameter type-id='type-id-1008' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_ppoll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_ppoll' mangled-name='ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppoll'>
@@ -20950,7 +20959,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_poll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
     <function-decl name='__interceptor_poll' mangled-name='poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='poll'>
@@ -20959,18 +20968,18 @@
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1250' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
+      <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_getgroups(int, __sanitizer::u32*) -->
     <function-decl name='__interceptor_getgroups' mangled-name='__interceptor_getgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getgroups'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- parameter of type '__sanitizer::u32*' -->
       <parameter type-id='type-id-1011' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_scandir64(char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
     <function-decl name='__interceptor_scandir64' mangled-name='__interceptor_scandir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir64'>
@@ -20983,7 +20992,7 @@
       <!-- parameter of type 'typedef scandir64_compar_f' -->
       <parameter type-id='type-id-424' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_scandir(char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
     <function-decl name='__interceptor_scandir' mangled-name='__interceptor_scandir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir'>
@@ -20996,23 +21005,23 @@
       <!-- parameter of type 'typedef scandir_compar_f' -->
       <parameter type-id='type-id-428' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___xpg_strerror_r(int, char*, SIZE_T) -->
     <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xpg_strerror_r'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- char* __interceptor_strerror_r(int, char*, SIZE_T) -->
     <function-decl name='__interceptor_strerror_r' mangled-name='strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strerror_r'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21023,25 +21032,25 @@
     <!-- char* __interceptor_strerror(int) -->
     <function-decl name='__interceptor_strerror' mangled-name='__interceptor_strerror' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strerror'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
     <!-- int __interceptor_sched_getaffinity(int, SIZE_T, void*) -->
     <function-decl name='__interceptor_sched_getaffinity' mangled-name='sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_getaffinity'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='cpusetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- SIZE_T __interceptor_confstr(int, char*, SIZE_T) -->
     <function-decl name='__interceptor_confstr' mangled-name='confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='confstr'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
+      <parameter type-id='type-id-10' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21059,11 +21068,11 @@
     <!-- int __interceptor_tcgetattr(int, void*) -->
     <function-decl name='__interceptor_tcgetattr' mangled-name='__interceptor_tcgetattr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tcgetattr'>
       <!-- parameter of type 'int' -->
-      <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>
     <!-- SIZE_T __interceptor_wcsnrtombs(char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
     <function-decl name='__interceptor_wcsnrtombs' mangled-name='__interceptor_wcsnrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsnrtombs'>
@@ -21150,7 +21159,7 @@
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-130' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- typedef INTMAX_T -->
       <return type-id='type-id-429'/>
     </function-decl>
@@ -21161,14 +21170,14 @@
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-130' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <!-- typedef INTMAX_T -->
       <return type-id='type-id-429'/>
     </function-decl>
     <!-- char* __interceptor_get_current_dir_name(int) -->
     <function-decl name='__interceptor_get_current_dir_name' mangled-name='get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_current_dir_name'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -21184,7 +21193,7 @@
     <!-- char* __interceptor_setlocale(int, char*) -->
     <function-decl name='__interceptor_setlocale' mangled-name='__interceptor_setlocale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setlocale'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='category' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
+      <parameter type-id='type-id-10' name='category' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='locale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
       <!-- char* -->
@@ -21193,9 +21202,9 @@
     <!-- __sanitizer::uptr __interceptor_ptrace(int, int, void*, void*) -->
     <function-decl name='__interceptor_ptrace' mangled-name='__interceptor_ptrace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ptrace'>
       <!-- 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*' -->
@@ -21212,7 +21221,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
       <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_dirent64* __interceptor_readdir64(void*) -->
     <function-decl name='__interceptor_readdir64' mangled-name='__interceptor_readdir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir64'>
@@ -21230,7 +21239,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
       <parameter type-id='type-id-967' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_dirent* __interceptor_readdir(void*) -->
     <function-decl name='__interceptor_readdir' mangled-name='__interceptor_readdir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir'>
@@ -21244,27 +21253,27 @@
       <!-- 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_getpeername(int, void*, unsigned int*) -->
     <function-decl name='__interceptor_getpeername' mangled-name='getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getpeername'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_recvmsg(int, __sanitizer::__sanitizer_msghdr*, int) -->
     <function-decl name='__interceptor_recvmsg' mangled-name='__interceptor_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recvmsg'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
       <parameter type-id='type-id-997' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-420'/>
     </function-decl>
@@ -21298,48 +21307,48 @@
     <!-- int __interceptor_accept4(int, void*, unsigned int*, int) -->
     <function-decl name='__interceptor_accept4' mangled-name='__interceptor_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_accept4'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='f' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
+      <parameter type-id='type-id-10' name='f' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_accept(int, void*, unsigned int*) -->
     <function-decl name='__interceptor_accept' mangled-name='__interceptor_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_accept'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_getsockopt(int, int, int, void*, int*) -->
     <function-decl name='__interceptor_getsockopt' mangled-name='__interceptor_getsockopt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getsockopt'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='level' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='level' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='optname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='optname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='optval' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='optlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_gethostbyname2_r(char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostbyname2_r' mangled-name='__interceptor_gethostbyname2_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2_r'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
       <parameter type-id='type-id-979' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -21351,7 +21360,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_gethostbyname_r(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostbyname_r' mangled-name='gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname_r'>
@@ -21368,16 +21377,16 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_gethostbyaddr_r(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostbyaddr_r' mangled-name='gethostbyaddr_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyaddr_r'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
       <parameter type-id='type-id-979' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -21389,7 +21398,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_gethostent_r(__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-decl name='__interceptor_gethostent_r' mangled-name='__interceptor_gethostent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent_r'>
@@ -21404,21 +21413,21 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostbyname2(char*, int) -->
     <function-decl name='__interceptor_gethostbyname2' mangled-name='__interceptor_gethostbyname2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-decl>
     <!-- __sanitizer::__sanitizer_hostent* __interceptor_gethostent(int) -->
     <function-decl name='__interceptor_gethostent' mangled-name='__interceptor_gethostent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
+      <parameter type-id='type-id-10' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-decl>
@@ -21427,9 +21436,9 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
+      <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-decl>
@@ -21443,13 +21452,13 @@
     <!-- int __interceptor_getsockname(int, void*, int*) -->
     <function-decl name='__interceptor_getsockname' mangled-name='__interceptor_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getsockname'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sock_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
+      <parameter type-id='type-id-10' name='sock_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_getschedparam(__sanitizer::uptr, int*, int*) -->
     <function-decl name='__interceptor_pthread_getschedparam' mangled-name='__interceptor_pthread_getschedparam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_getschedparam'>
@@ -21460,7 +21469,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='param' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_inet_aton(const char*, void*) -->
     <function-decl name='__interceptor_inet_aton' mangled-name='inet_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inet_aton'>
@@ -21469,23 +21478,23 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_inet_pton(int, const char*, void*) -->
     <function-decl name='__interceptor_inet_pton' mangled-name='__interceptor_inet_pton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inet_pton'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- char* __interceptor_inet_ntop(int, void*, char*, __sanitizer::u32) -->
     <function-decl name='__interceptor_inet_ntop' mangled-name='__interceptor_inet_ntop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inet_ntop'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -21498,77 +21507,77 @@
     <!-- int __interceptor_wait4(int, int*, int, void*) -->
     <function-decl name='__interceptor_wait4' mangled-name='wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait4'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_wait3(int*, int, void*) -->
     <function-decl name='__interceptor_wait3' mangled-name='wait3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait3'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_waitpid(int, int*, int) -->
     <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_waitid(int, int, void*, int) -->
     <function-decl name='__interceptor_waitid' mangled-name='waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='waitid'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <parameter type-id='type-id-10' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <parameter type-id='type-id-10' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='infop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_wait(int*) -->
     <function-decl name='__interceptor_wait' mangled-name='__interceptor_wait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wait'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_setitimer(int, void*, void*) -->
     <function-decl name='__interceptor_setitimer' mangled-name='__interceptor_setitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setitimer'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='which' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
+      <parameter type-id='type-id-10' name='which' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='new_value' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='old_value' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_getitimer(int, void*) -->
     <function-decl name='__interceptor_getitimer' mangled-name='getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getitimer'>
       <!-- 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_clock_settime(__sanitizer::u32, void*) -->
     <function-decl name='__interceptor_clock_settime' mangled-name='clock_settime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_settime'>
@@ -21577,7 +21586,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_clock_gettime(__sanitizer::u32, void*) -->
     <function-decl name='__interceptor_clock_gettime' mangled-name='clock_gettime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_gettime'>
@@ -21586,7 +21595,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_clock_getres(__sanitizer::u32, void*) -->
     <function-decl name='__interceptor_clock_getres' mangled-name='__interceptor_clock_getres' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_clock_getres'>
@@ -21595,18 +21604,18 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_ioctl(int, unsigned int, void*) -->
     <function-decl name='__interceptor_ioctl' mangled-name='ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ioctl'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
+      <parameter type-id='type-id-10' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='request' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_vfscanf(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vfscanf'>
@@ -21617,7 +21626,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_fscanf(void*, const char*, ...) -->
     <function-decl name='__interceptor___isoc99_fscanf' mangled-name='__isoc99_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_fscanf'>
@@ -21627,7 +21636,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_vsscanf(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vsscanf'>
@@ -21638,7 +21647,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_sscanf(const char*, const char*, ...) -->
     <function-decl name='__interceptor___isoc99_sscanf' mangled-name='__isoc99_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_sscanf'>
@@ -21648,7 +21657,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_vscanf(const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vscanf'>
@@ -21657,7 +21666,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___isoc99_scanf(const char*, ...) -->
     <function-decl name='__interceptor___isoc99_scanf' mangled-name='__isoc99_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_scanf'>
@@ -21665,7 +21674,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_vfscanf(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor_vfscanf' mangled-name='vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vfscanf'>
@@ -21676,7 +21685,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_fscanf(void*, const char*, ...) -->
     <function-decl name='__interceptor_fscanf' mangled-name='__interceptor_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fscanf'>
@@ -21686,7 +21695,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_vsscanf(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor_vsscanf' mangled-name='__interceptor_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vsscanf'>
@@ -21697,7 +21706,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sscanf(const char*, const char*, ...) -->
     <function-decl name='__interceptor_sscanf' mangled-name='sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'>
@@ -21707,7 +21716,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_vscanf(const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-decl name='__interceptor_vscanf' mangled-name='vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscanf'>
@@ -21716,7 +21725,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_scanf(const char*, ...) -->
     <function-decl name='__interceptor_scanf' mangled-name='scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scanf'>
@@ -21724,7 +21733,7 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- char* __interceptor_strptime(char*, char*, __sanitizer::__sanitizer_tm*) -->
     <function-decl name='__interceptor_strptime' mangled-name='__interceptor_strptime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strptime'>
@@ -21811,7 +21820,7 @@
     <!-- int __interceptor_prctl(int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
     <function-decl name='__interceptor_prctl' mangled-name='prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='prctl'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
+      <parameter type-id='type-id-10' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-33' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -21821,16 +21830,16 @@
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-33' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pwritev64(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <function-decl name='__interceptor_pwritev64' mangled-name='pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -21839,11 +21848,11 @@
     <!-- SSIZE_T __interceptor_pwritev(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
     <function-decl name='__interceptor_pwritev' mangled-name='pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -21852,18 +21861,18 @@
     <!-- SSIZE_T __interceptor_writev(int, __sanitizer::__sanitizer_iovec*, int) -->
     <function-decl name='__interceptor_writev' mangled-name='__interceptor_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_writev'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-420'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pwrite64(int, void*, OFF64_T, OFF64_T) -->
     <function-decl name='__interceptor_pwrite64' mangled-name='pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -21876,7 +21885,7 @@
     <!-- SSIZE_T __interceptor_pwrite(int, void*, SIZE_T, OFF_T) -->
     <function-decl name='__interceptor_pwrite' mangled-name='pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21889,7 +21898,7 @@
     <!-- SSIZE_T __interceptor_write(int, void*, SIZE_T) -->
     <function-decl name='__interceptor_write' mangled-name='write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='write'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21900,11 +21909,11 @@
     <!-- SSIZE_T __interceptor_preadv64(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <function-decl name='__interceptor_preadv64' mangled-name='preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- parameter of type 'typedef OFF64_T' -->
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -21913,11 +21922,11 @@
     <!-- SSIZE_T __interceptor_preadv(int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
     <function-decl name='__interceptor_preadv' mangled-name='preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- parameter of type 'typedef OFF_T' -->
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <!-- typedef SSIZE_T -->
@@ -21926,18 +21935,18 @@
     <!-- SSIZE_T __interceptor_readv(int, __sanitizer::__sanitizer_iovec*, int) -->
     <function-decl name='__interceptor_readv' mangled-name='readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='readv'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-420'/>
     </function-decl>
     <!-- SSIZE_T __interceptor_pread64(int, void*, SIZE_T, OFF64_T) -->
     <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21950,7 +21959,7 @@
     <!-- SSIZE_T __interceptor_pread(int, void*, SIZE_T, OFF_T) -->
     <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -21963,7 +21972,7 @@
     <!-- SSIZE_T __interceptor_read(int, void*, SIZE_T) -->
     <function-decl name='__interceptor_read' mangled-name='read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='read'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -22007,7 +22016,7 @@
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_strcasecmp(const char*, const char*) -->
     <function-decl name='__interceptor_strcasecmp' mangled-name='__interceptor_strcasecmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strcasecmp'>
@@ -22016,7 +22025,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_strncmp(const char*, const char*, __sanitizer::uptr) -->
     <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp'>
@@ -22027,7 +22036,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_strcmp(const char*, const char*) -->
     <function-decl name='__interceptor_strcmp' mangled-name='__interceptor_strcmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strcmp'>
@@ -22036,7 +22045,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- char* __interceptor_textdomain(const char*) -->
     <function-decl name='__interceptor_textdomain' mangled-name='textdomain' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='textdomain'>
@@ -22048,9 +22057,9 @@
     <!-- int __interceptor_fork(int) -->
     <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork'>
       <!-- 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_getaddrinfo(void*, void*, void*, void*) -->
     <function-decl name='__interceptor_getaddrinfo' mangled-name='__interceptor_getaddrinfo' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getaddrinfo'>
@@ -22063,7 +22072,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_gettimeofday(void*, void*) -->
     <function-decl name='__interceptor_gettimeofday' mangled-name='gettimeofday' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gettimeofday'>
@@ -22072,55 +22081,55 @@
       <!-- 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_kill(void*, int) -->
     <function-decl name='__interceptor_pthread_kill' mangled-name='pthread_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_kill'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_kill(int, int) -->
     <function-decl name='__interceptor_kill' mangled-name='__interceptor_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_kill'>
       <!-- 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>
     <!-- int __interceptor_raise(int) -->
     <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise'>
       <!-- 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_sigsuspend(const __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1053' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sigaction(int, sigaction_t*, sigaction_t*) -->
     <function-decl name='__interceptor_sigaction' mangled-name='sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigaction'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
       <parameter type-id='type-id-1186' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- parameter of type 'sigaction_t*' -->
       <parameter type-id='type-id-1186' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- sighandler_t __interceptor_signal(int, sighandler_t) -->
     <function-decl name='__interceptor_signal' mangled-name='__interceptor_signal' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_signal'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
       <!-- parameter of type 'typedef sighandler_t' -->
       <parameter type-id='type-id-435' name='h' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
       <!-- typedef sighandler_t -->
@@ -22129,28 +22138,28 @@
     <!-- int __interceptor_epoll_wait(int, void*, int, int) -->
     <function-decl name='__interceptor_epoll_wait' mangled-name='epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_wait'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <parameter type-id='type-id-10' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_epoll_ctl(int, int, int, void*) -->
     <function-decl name='__interceptor_epoll_ctl' mangled-name='epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_ctl'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void* __interceptor_opendir(char*) -->
     <function-decl name='__interceptor_opendir' mangled-name='__interceptor_opendir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_opendir'>
@@ -22164,19 +22173,19 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_puts(const char*) -->
     <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void __interceptor_abort(int) -->
     <function-decl name='__interceptor_abort' mangled-name='abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='abort'>
       <!-- 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>
@@ -22185,7 +22194,7 @@
       <!-- 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>
     <!-- __sanitizer::uptr __interceptor_fwrite(void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
     <function-decl name='__interceptor_fwrite' mangled-name='fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fwrite'>
@@ -22218,7 +22227,7 @@
       <!-- 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* __interceptor_freopen(char*, char*, void*) -->
     <function-decl name='__interceptor_freopen' mangled-name='__interceptor_freopen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_freopen'>
@@ -22245,42 +22254,42 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- long_t __interceptor_recv(int, void*, long_t, int) -->
     <function-decl name='__interceptor_recv' mangled-name='recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='recv'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- typedef long_t -->
       <return type-id='type-id-438'/>
     </function-decl>
     <!-- long_t __interceptor_sendmsg(int, void*, int) -->
     <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='msg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <!-- typedef long_t -->
       <return type-id='type-id-438'/>
     </function-decl>
     <!-- long_t __interceptor_send(int, void*, long_t, int) -->
     <function-decl name='__interceptor_send' mangled-name='send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='send'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <!-- typedef long_t -->
       <return type-id='type-id-438'/>
     </function-decl>
@@ -22289,16 +22298,16 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='pipefd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pipe(int*) -->
     <function-decl name='__interceptor_pipe' mangled-name='__interceptor_pipe' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pipe'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void __interceptor___res_iclose(void*, bool) -->
     <function-decl name='__interceptor___res_iclose' mangled-name='__interceptor___res_iclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___res_iclose'>
@@ -22312,226 +22321,226 @@
     <!-- int __interceptor___close(int) -->
     <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close'>
       <!-- 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_close(int) -->
     <function-decl name='__interceptor_close' mangled-name='close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='close'>
       <!-- 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_epoll_create1(int) -->
     <function-decl name='__interceptor_epoll_create1' mangled-name='epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_create1'>
       <!-- 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_epoll_create(int) -->
     <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create'>
       <!-- 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_listen(int, int) -->
     <function-decl name='__interceptor_listen' mangled-name='__interceptor_listen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_listen'>
       <!-- 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>
     <!-- int __interceptor_bind(int, void*, unsigned int) -->
     <function-decl name='__interceptor_bind' mangled-name='bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bind'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_connect(int, void*, unsigned int) -->
     <function-decl name='__interceptor_connect' mangled-name='connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='connect'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_socketpair(int, int, int, int*) -->
     <function-decl name='__interceptor_socketpair' mangled-name='__interceptor_socketpair' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_socketpair'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_socket(int, int, int) -->
     <function-decl name='__interceptor_socket' mangled-name='__interceptor_socket' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_socket'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_inotify_init1(int) -->
     <function-decl name='__interceptor_inotify_init1' mangled-name='inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inotify_init1'>
       <!-- 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_inotify_init(int) -->
     <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init'>
       <!-- 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_signalfd(int, void*, int) -->
     <function-decl name='__interceptor_signalfd' mangled-name='signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='signalfd'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_eventfd(unsigned int, int) -->
     <function-decl name='__interceptor_eventfd' mangled-name='eventfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='eventfd'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='initval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_dup3(int, int, int) -->
     <function-decl name='__interceptor_dup3' mangled-name='__interceptor_dup3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup3'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_dup2(int, int) -->
     <function-decl name='__interceptor_dup2' mangled-name='dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup2'>
       <!-- 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>
     <!-- int __interceptor_dup(int) -->
     <function-decl name='__interceptor_dup' mangled-name='dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup'>
       <!-- 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_creat64(const char*, int) -->
     <function-decl name='__interceptor_creat64' mangled-name='__interceptor_creat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_creat64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_creat(const char*, int) -->
     <function-decl name='__interceptor_creat' mangled-name='__interceptor_creat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_creat'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_open64(const char*, int, int) -->
     <function-decl name='__interceptor_open64' mangled-name='__interceptor_open64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_open64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_open(const char*, int, int) -->
     <function-decl name='__interceptor_open' mangled-name='open' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='open'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_fstat64(int, void*) -->
     <function-decl name='__interceptor_fstat64' mangled-name='__interceptor_fstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstat64'>
       <!-- 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___fxstat64(int, int, void*) -->
     <function-decl name='__interceptor___fxstat64' mangled-name='__interceptor___fxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___fxstat64'>
       <!-- 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>
     <!-- int __interceptor_fstat(int, void*) -->
     <function-decl name='__interceptor_fstat' mangled-name='__interceptor_fstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstat'>
       <!-- 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___fxstat(int, int, void*) -->
     <function-decl name='__interceptor___fxstat' mangled-name='__interceptor___fxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___fxstat'>
       <!-- 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>
     <!-- int __interceptor_lstat64(const char*, void*) -->
     <function-decl name='__interceptor_lstat64' mangled-name='lstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lstat64'>
@@ -22540,18 +22549,18 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___lxstat64(int, const char*, void*) -->
     <function-decl name='__interceptor___lxstat64' mangled-name='__lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_lstat(const char*, void*) -->
     <function-decl name='__interceptor_lstat' mangled-name='__interceptor_lstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lstat'>
@@ -22560,18 +22569,18 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___lxstat(int, const char*, void*) -->
     <function-decl name='__interceptor___lxstat' mangled-name='__lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_stat64(const char*, void*) -->
     <function-decl name='__interceptor_stat64' mangled-name='__interceptor_stat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_stat64'>
@@ -22580,18 +22589,18 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___xstat64(int, const char*, void*) -->
     <function-decl name='__interceptor___xstat64' mangled-name='__xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xstat64'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_stat(const char*, void*) -->
     <function-decl name='__interceptor_stat' mangled-name='stat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stat'>
@@ -22600,18 +22609,18 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor___xstat(int, const char*, void*) -->
     <function-decl name='__interceptor___xstat' mangled-name='__interceptor___xstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xstat'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sem_getvalue(void*, int*) -->
     <function-decl name='__interceptor_sem_getvalue' mangled-name='__interceptor_sem_getvalue' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_getvalue'>
@@ -22620,14 +22629,14 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='sval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_sem_post(void*) -->
     <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post'>
       <!-- 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_sem_timedwait(void*, void*) -->
     <function-decl name='__interceptor_sem_timedwait' mangled-name='sem_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_timedwait'>
@@ -22636,39 +22645,39 @@
       <!-- 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_sem_trywait(void*) -->
     <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait'>
       <!-- 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_sem_wait(void*) -->
     <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait'>
       <!-- 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_sem_destroy(void*) -->
     <function-decl name='__interceptor_sem_destroy' mangled-name='sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_destroy'>
       <!-- 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_sem_init(void*, int, unsigned int) -->
     <function-decl name='__interceptor_sem_init' mangled-name='sem_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_init'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
+      <parameter type-id='type-id-10' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='value' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_once(void*, void ()*) -->
     <function-decl name='__interceptor_pthread_once' mangled-name='pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_once'>
@@ -22677,21 +22686,21 @@
       <!-- parameter of type 'void ()*' -->
       <parameter type-id='type-id-125' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_barrier_wait(void*) -->
     <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait'>
       <!-- 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_barrier_destroy(void*) -->
     <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy'>
       <!-- 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_barrier_init(void*, void*, unsigned int) -->
     <function-decl name='__interceptor_pthread_barrier_init' mangled-name='pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_barrier_init'>
@@ -22702,7 +22711,7 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='count' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_cond_timedwait(void*, void*, void*) -->
     <function-decl name='__interceptor_pthread_cond_timedwait' mangled-name='__interceptor_pthread_cond_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_timedwait'>
@@ -22713,21 +22722,21 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='abstime' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_cond_destroy(void*) -->
     <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy'>
       <!-- 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_rwlock_unlock(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_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_rwlock_timedwrlock(void*, void*) -->
     <function-decl name='__interceptor_pthread_rwlock_timedwrlock' mangled-name='__interceptor_pthread_rwlock_timedwrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1074' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_timedwrlock'>
@@ -22736,21 +22745,21 @@
       <!-- 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_rwlock_trywrlock(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_trywrlock'>
       <!-- 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_rwlock_wrlock(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock'>
       <!-- 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_rwlock_timedrdlock(void*, void*) -->
     <function-decl name='__interceptor_pthread_rwlock_timedrdlock' mangled-name='pthread_rwlock_timedrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_timedrdlock'>
@@ -22759,28 +22768,28 @@
       <!-- 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_rwlock_tryrdlock(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_tryrdlock'>
       <!-- 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_rwlock_rdlock(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock'>
       <!-- 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_rwlock_destroy(void*) -->
     <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy'>
       <!-- 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_rwlock_init(void*, void*) -->
     <function-decl name='__interceptor_pthread_rwlock_init' mangled-name='__interceptor_pthread_rwlock_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_init'>
@@ -22789,44 +22798,44 @@
       <!-- 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_spin_unlock(void*) -->
     <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_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_spin_trylock(void*) -->
     <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock'>
       <!-- 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_spin_lock(void*) -->
     <function-decl name='__interceptor_pthread_spin_lock' mangled-name='pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_lock'>
       <!-- 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_spin_destroy(void*) -->
     <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy'>
       <!-- 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_spin_init(void*, int) -->
     <function-decl name='__interceptor_pthread_spin_init' mangled-name='pthread_spin_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_init'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_mutex_timedlock(void*, void*) -->
     <function-decl name='__interceptor_pthread_mutex_timedlock' mangled-name='__interceptor_pthread_mutex_timedlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_timedlock'>
@@ -22835,21 +22844,21 @@
       <!-- 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_trylock(void*) -->
     <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_trylock'>
       <!-- 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_destroy(void*) -->
     <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy'>
       <!-- 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_init(void*, void*) -->
     <function-decl name='__interceptor_pthread_mutex_init' mangled-name='pthread_mutex_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_init'>
@@ -22858,14 +22867,14 @@
       <!-- 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_detach(void*) -->
     <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach'>
       <!-- 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_join(void*, void**) -->
     <function-decl name='__interceptor_pthread_join' mangled-name='__interceptor_pthread_join' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_join'>
@@ -22874,7 +22883,7 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='ret' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_pthread_create(void*, void*, void* (void*)*, void*) -->
     <function-decl name='__interceptor_pthread_create' mangled-name='__interceptor_pthread_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_create'>
@@ -22887,7 +22896,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='param' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void __cxa_guard_abort(__sanitizer::atomic_uint32_t*) -->
     <function-decl name='__cxa_guard_abort' mangled-name='__cxa_guard_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_abort'>
@@ -22908,7 +22917,7 @@
       <!-- parameter of type '__sanitizer::atomic_uint32_t*' -->
       <parameter type-id='type-id-1009' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_posix_memalign(void**, __sanitizer::uptr, __sanitizer::uptr) -->
     <function-decl name='__interceptor_posix_memalign' mangled-name='__interceptor_posix_memalign' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_posix_memalign'>
@@ -22919,7 +22928,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void* __interceptor_pvalloc(__sanitizer::uptr) -->
     <function-decl name='__interceptor_pvalloc' mangled-name='__interceptor_pvalloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pvalloc'>
@@ -22951,7 +22960,7 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void* __interceptor_mmap64(void*, long_t, int, int, int, __sanitizer::u64) -->
     <function-decl name='__interceptor_mmap64' mangled-name='__interceptor_mmap64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap64'>
@@ -22960,11 +22969,11 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::u64' -->
       <parameter type-id='type-id-198' name='off' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <!-- void* -->
@@ -22977,11 +22986,11 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='off' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <!-- void* -->
@@ -23028,7 +23037,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -23037,7 +23046,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -23046,7 +23055,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-decl>
@@ -23066,7 +23075,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
       <!-- void* -->
@@ -23077,7 +23086,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* -->
@@ -23092,7 +23101,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>
     <!-- void* __interceptor_memcpy(void*, void*, __sanitizer::uptr) -->
     <function-decl name='__interceptor_memcpy' mangled-name='memcpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memcpy'>
@@ -23110,7 +23119,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* -->
@@ -23256,7 +23265,7 @@
       <!-- parameter of type '__sanitizer::uptr*' -->
       <parameter type-id='type-id-131' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
+      <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -23265,7 +23274,7 @@
       <!-- parameter of type '__sanitizer::uptr*' -->
       <parameter type-id='type-id-131' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
+      <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -23278,7 +23287,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dso' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_on_exit(void (int, void*)*, void*) -->
     <function-decl name='__interceptor_on_exit' mangled-name='__interceptor_on_exit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_on_exit'>
@@ -23287,28 +23296,28 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __interceptor_atexit(void ()*) -->
     <function-decl name='__interceptor_atexit' mangled-name='__interceptor_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_atexit'>
       <!-- 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 __interceptor_dlclose(void*) -->
     <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose'>
       <!-- 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* __interceptor_dlopen(const char*, int) -->
     <function-decl name='__interceptor_dlopen' mangled-name='__interceptor_dlopen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlopen'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='filename' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
+      <parameter type-id='type-id-10' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
       <!-- void* -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -23319,14 +23328,14 @@
       <!-- 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_usleep(long_t) -->
     <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='usec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- unsigned int __interceptor_sleep(unsigned int) -->
     <function-decl name='__interceptor_sleep' mangled-name='sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sleep'>
@@ -25143,23 +25152,23 @@
       <!-- 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 pthread_yield() -->
     <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' 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>
     <!-- int pthread_sigmask(int, const __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-decl name='pthread_sigmask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='50' 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_sigset_t*' -->
       <parameter type-id='type-id-1053'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void* pthread_self() -->
     <function-decl name='pthread_self' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25171,7 +25180,7 @@
       <!-- 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 pthread_mutexattr_gettype(void*, int*) -->
     <function-decl name='pthread_mutexattr_gettype' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25180,21 +25189,21 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='sval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int pthread_attr_destroy(void*) -->
     <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- 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 pthread_attr_init(void*) -->
     <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- 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* __libc_malloc(__sanitizer::uptr) -->
     <function-decl name='__libc_malloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25224,11 +25233,11 @@
     <!-- int mallopt(int, int) -->
     <function-decl name='mallopt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='62' 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>
     <!-- int pthread_key_create(unsigned int*, void (void*)*) -->
     <function-decl name='pthread_key_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25237,7 +25246,7 @@
       <!-- parameter of type 'void (void*)*' -->
       <parameter type-id='type-id-470'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- __sanitizer::Suppression* -->
     <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
@@ -25279,7 +25288,7 @@
             <!-- implicit parameter of type '__tsan::Mutex*' -->
             <parameter type-id='type-id-1258' 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>
@@ -25370,7 +25379,7 @@
             <!-- implicit parameter of type '__tsan::Mutex*' -->
             <parameter type-id='type-id-1258' 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>
@@ -25441,14 +25450,14 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-type>
     <!-- __sanitizer::__sanitizer_hostent* (int) -->
     <function-type size-in-bits='64' id='type-id-982'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fake'/>
+      <parameter type-id='type-id-10' name='fake'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-type>
@@ -25457,9 +25466,9 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='len'/>
+      <parameter type-id='type-id-10' name='len'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='type'/>
       <!-- __sanitizer::__sanitizer_hostent* -->
       <return type-id='type-id-979'/>
     </function-type>
@@ -25479,7 +25488,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='buflen'/>
+      <parameter type-id='type-id-10' name='buflen'/>
       <!-- __sanitizer::__sanitizer_mntent* -->
       <return type-id='type-id-993'/>
     </function-type>
@@ -25583,7 +25592,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c'/>
+      <parameter type-id='type-id-10' name='c'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
@@ -25615,14 +25624,14 @@
     <!-- char* (int) -->
     <function-type size-in-bits='64' id='type-id-1025'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- char* (int, char*) -->
     <function-type size-in-bits='64' id='type-id-1026'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='category'/>
+      <parameter type-id='type-id-10' name='category'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='locale'/>
       <!-- char* -->
@@ -25631,7 +25640,7 @@
     <!-- char* (int, char*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-1027'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -25642,7 +25651,7 @@
     <!-- char* (int, void*, char*, __sanitizer::u32) -->
     <function-type size-in-bits='64' id='type-id-1028'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='src'/>
       <!-- parameter of type 'char*' -->
@@ -25673,7 +25682,7 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='buffer'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size'/>
+      <parameter type-id='type-id-10' name='size'/>
       <!-- char** -->
       <return type-id='type-id-130'/>
     </function-type>
@@ -25761,7 +25770,7 @@
     <!-- int () -->
     <function-type size-in-bits='64' id='type-id-1078'>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-type size-in-bits='64' id='type-id-1079'>
@@ -25776,7 +25785,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
     <function-type size-in-bits='64' id='type-id-1080'>
@@ -25785,9 +25794,9 @@
       <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
       <parameter type-id='type-id-1250' name='nfds'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='timeout'/>
+      <parameter type-id='type-id-10' name='timeout'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-type size-in-bits='64' id='type-id-1081'>
@@ -25800,14 +25809,14 @@
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='sigmask'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*) -->
     <function-type size-in-bits='64' id='type-id-1082'>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, int*) -->
     <function-type size-in-bits='64' id='type-id-1083'>
@@ -25816,7 +25825,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='sig'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-1084'>
@@ -25825,7 +25834,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='info'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::__sanitizer_sigset_t*, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1085'>
@@ -25836,14 +25845,14 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='timeout'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*) -->
     <function-type size-in-bits='64' id='type-id-1086'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent***, scandir_filter_f, scandir_compar_f) -->
     <function-type size-in-bits='64' id='type-id-1087'>
@@ -25856,7 +25865,7 @@
       <!-- parameter of type 'typedef scandir_compar_f' -->
       <parameter type-id='type-id-428' name='compar'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_dirent64***, scandir64_filter_f, scandir64_compar_f) -->
     <function-type size-in-bits='64' id='type-id-1088'>
@@ -25869,7 +25878,7 @@
       <!-- parameter of type 'typedef scandir64_compar_f' -->
       <parameter type-id='type-id-424' name='compar'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*) -->
     <function-type size-in-bits='64' id='type-id-1089'>
@@ -25878,7 +25887,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
       <parameter type-id='type-id-975' name='addr'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
     <function-type size-in-bits='64' id='type-id-1090'>
@@ -25889,7 +25898,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='hostname'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-type size-in-bits='64' id='type-id-1091'>
@@ -25906,7 +25915,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::__sanitizer_wordexp_t*, int) -->
     <function-type size-in-bits='64' id='type-id-1092'>
@@ -25915,16 +25924,16 @@
       <!-- parameter of type '__sanitizer::__sanitizer_wordexp_t*' -->
       <parameter type-id='type-id-1008' name='p'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-type size-in-bits='64' id='type-id-1093'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
       <parameter type-id='type-id-979' name='ret'/>
       <!-- parameter of type 'char*' -->
@@ -25936,7 +25945,7 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, __sanitizer::u32) -->
     <function-type size-in-bits='64' id='type-id-1094'>
@@ -25945,7 +25954,7 @@
       <!-- parameter of type 'typedef __sanitizer::u32' -->
       <parameter type-id='type-id-196' name='group'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (char*, void*) -->
     <function-type size-in-bits='64' id='type-id-1095'>
@@ -25954,14 +25963,14 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent*) -->
     <function-type size-in-bits='64' id='type-id-1096'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent*' -->
       <parameter type-id='type-id-1045'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent**, const __sanitizer::__sanitizer_dirent**) -->
     <function-type size-in-bits='64' id='type-id-1097'>
@@ -25970,14 +25979,14 @@
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent**' -->
       <parameter type-id='type-id-1046'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64*) -->
     <function-type size-in-bits='64' id='type-id-1098'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64*' -->
       <parameter type-id='type-id-1048'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_dirent64**, const __sanitizer::__sanitizer_dirent64**) -->
     <function-type size-in-bits='64' id='type-id-1099'>
@@ -25986,21 +25995,21 @@
       <!-- parameter of type 'const __sanitizer::__sanitizer_dirent64**' -->
       <parameter type-id='type-id-1049'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const __sanitizer::__sanitizer_sigset_t*) -->
     <function-type size-in-bits='64' id='type-id-1100'>
       <!-- parameter of type 'const __sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1053' name='mask'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*) -->
     <function-type size-in-bits='64' id='type-id-1101'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, const char*) -->
     <function-type size-in-bits='64' id='type-id-1102'>
@@ -26009,7 +26018,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='s2'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, const char*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-1103'>
@@ -26020,7 +26029,7 @@
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='n'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, const char*, __sanitizer::uptr) -->
     <function-type size-in-bits='64' id='type-id-1104'>
@@ -26031,7 +26040,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='size'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-type size-in-bits='64' id='type-id-1105'>
@@ -26042,7 +26051,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, const char*, ...) -->
     <function-type size-in-bits='64' id='type-id-1106'>
@@ -26052,27 +26061,27 @@
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, int) -->
     <function-type size-in-bits='64' id='type-id-1107'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode'/>
+      <parameter type-id='type-id-10' name='mode'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, int, int) -->
     <function-type size-in-bits='64' id='type-id-1108'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='mode'/>
+      <parameter type-id='type-id-10' name='mode'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-type size-in-bits='64' id='type-id-1109'>
@@ -26081,7 +26090,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, ...) -->
     <function-type size-in-bits='64' id='type-id-1110'>
@@ -26089,7 +26098,7 @@
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (const char*, void*) -->
     <function-type size-in-bits='64' id='type-id-1111'>
@@ -26098,230 +26107,230 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int) -->
     <function-type size-in-bits='64' id='type-id-1112'>
       <!-- 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-type>
     <!-- int (int*) -->
     <function-type size-in-bits='64' id='type-id-1113'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int*, int) -->
     <function-type size-in-bits='64' id='type-id-1114'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='pipefd'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int*, int, void*) -->
     <function-type size-in-bits='64' id='type-id-1115'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rusage'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, __sanitizer::__sanitizer_sigset_t*, __sanitizer::__sanitizer_sigset_t*) -->
     <function-type size-in-bits='64' id='type-id-1116'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='how'/>
+      <parameter type-id='type-id-10' name='how'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='set'/>
       <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
       <parameter type-id='type-id-1002' name='oldset'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, __sanitizer::u32*) -->
     <function-type size-in-bits='64' id='type-id-1117'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size'/>
+      <parameter type-id='type-id-10' name='size'/>
       <!-- parameter of type '__sanitizer::u32*' -->
       <parameter type-id='type-id-1011' name='lst'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, char*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-1118'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='buflen'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, const char*, void*) -->
     <function-type size-in-bits='64' id='type-id-1119'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='src'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dst'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int) -->
     <function-type size-in-bits='64' id='type-id-1120'>
       <!-- 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-type>
     <!-- int (int, int*, int) -->
     <function-type size-in-bits='64' id='type-id-1121'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int*, int, void*) -->
     <function-type size-in-bits='64' id='type-id-1122'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rusage'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, int) -->
     <function-type size-in-bits='64' id='type-id-1123'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='domain'/>
+      <parameter type-id='type-id-10' name='domain'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='type'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='protocol'/>
+      <parameter type-id='type-id-10' name='protocol'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, int, int*) -->
     <function-type size-in-bits='64' id='type-id-1124'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='domain'/>
+      <parameter type-id='type-id-10' name='domain'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='type'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='protocol'/>
+      <parameter type-id='type-id-10' name='protocol'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='fd'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, int, void*) -->
     <function-type size-in-bits='64' id='type-id-1125'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='epfd'/>
+      <parameter type-id='type-id-10' name='epfd'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='op'/>
+      <parameter type-id='type-id-10' name='op'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ev'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, int, void*, int*) -->
     <function-type size-in-bits='64' id='type-id-1126'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sockfd'/>
+      <parameter type-id='type-id-10' name='sockfd'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='level'/>
+      <parameter type-id='type-id-10' name='level'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='optname'/>
+      <parameter type-id='type-id-10' name='optname'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='optval'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='optlen'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, void*) -->
     <function-type size-in-bits='64' id='type-id-1127'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='shmid'/>
+      <parameter type-id='type-id-10' name='shmid'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='cmd'/>
+      <parameter type-id='type-id-10' name='cmd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, int, void*, int) -->
     <function-type size-in-bits='64' id='type-id-1128'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='idtype'/>
+      <parameter type-id='type-id-10' name='idtype'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='id'/>
+      <parameter type-id='type-id-10' name='id'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='infop'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, sigaction_t*, sigaction_t*) -->
     <function-type size-in-bits='64' id='type-id-1129'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig'/>
+      <parameter type-id='type-id-10' name='sig'/>
       <!-- parameter of type 'sigaction_t*' -->
       <parameter type-id='type-id-1186' name='act'/>
       <!-- parameter of type 'sigaction_t*' -->
       <parameter type-id='type-id-1186' name='old'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, SIZE_T, void*) -->
     <function-type size-in-bits='64' id='type-id-1130'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-418' name='cpusetsize'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='mask'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-1131'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='d'/>
+      <parameter type-id='type-id-10' name='d'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='request'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, unsigned long int, unsigned long int, unsigned long int, unsigned long int) -->
     <function-type size-in-bits='64' id='type-id-1132'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='option'/>
+      <parameter type-id='type-id-10' name='option'/>
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-33' name='arg2'/>
       <!-- parameter of type 'unsigned long int' -->
@@ -26331,97 +26340,97 @@
       <!-- parameter of type 'unsigned long int' -->
       <parameter type-id='type-id-33' name='arg5'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*) -->
     <function-type size-in-bits='64' id='type-id-1133'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, int) -->
     <function-type size-in-bits='64' id='type-id-1134'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='mask'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, int*) -->
     <function-type size-in-bits='64' id='type-id-1135'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sock_fd'/>
+      <parameter type-id='type-id-10' name='sock_fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='addrlen'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, int, int) -->
     <function-type size-in-bits='64' id='type-id-1136'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='epfd'/>
+      <parameter type-id='type-id-10' name='epfd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ev'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='cnt'/>
+      <parameter type-id='type-id-10' name='cnt'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='timeout'/>
+      <parameter type-id='type-id-10' name='timeout'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1137'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='addrlen'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, unsigned int*) -->
     <function-type size-in-bits='64' id='type-id-1138'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sockfd'/>
+      <parameter type-id='type-id-10' name='sockfd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-155' name='addrlen'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, unsigned int*, int) -->
     <function-type size-in-bits='64' id='type-id-1139'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-155' name='addrlen'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='f'/>
+      <parameter type-id='type-id-10' name='f'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (int, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1140'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='which'/>
+      <parameter type-id='type-id-10' name='which'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='new_value'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='old_value'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::u32, void*) -->
     <function-type size-in-bits='64' id='type-id-1141'>
@@ -26430,7 +26439,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tp'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::uptr, const char*) -->
     <function-type size-in-bits='64' id='type-id-1142'>
@@ -26439,7 +26448,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='name'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (__sanitizer::uptr, int*, int*) -->
     <function-type size-in-bits='64' id='type-id-1143'>
@@ -26450,30 +26459,30 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='param'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (long_t) -->
     <function-type size-in-bits='64' id='type-id-1144'>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='usec'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (unsigned int, int) -->
     <function-type size-in-bits='64' id='type-id-1145'>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='initval'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void ()*) -->
     <function-type size-in-bits='64' id='type-id-1146'>
       <!-- parameter of type 'void ()*' -->
       <parameter type-id='type-id-125' name='f'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void (int, void*)*, void*) -->
     <function-type size-in-bits='64' id='type-id-1147'>
@@ -26482,7 +26491,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='arg'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void (void*)*, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1148'>
@@ -26493,23 +26502,23 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='dso'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*) -->
     <function-type size-in-bits='64' id='type-id-206'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='env'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void**, int) -->
     <function-type size-in-bits='64' id='type-id-1149'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='buffer'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='size'/>
+      <parameter type-id='type-id-10' name='size'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void**, __sanitizer::uptr, __sanitizer::uptr) -->
     <function-type size-in-bits='64' id='type-id-1150'>
@@ -26520,7 +26529,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='sz'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent*, __sanitizer::__sanitizer_dirent**) -->
     <function-type size-in-bits='64' id='type-id-1151'>
@@ -26531,7 +26540,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_dirent**' -->
       <parameter type-id='type-id-967' name='result'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, __sanitizer::__sanitizer_dirent64*, __sanitizer::__sanitizer_dirent64**) -->
     <function-type size-in-bits='64' id='type-id-1152'>
@@ -26542,7 +26551,7 @@
       <!-- parameter of type '__sanitizer::__sanitizer_dirent64**' -->
       <parameter type-id='type-id-972' name='result'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, __sanitizer::u32*) -->
     <function-type size-in-bits='64' id='type-id-1153'>
@@ -26551,7 +26560,7 @@
       <!-- parameter of type '__sanitizer::u32*' -->
       <parameter type-id='type-id-1011' name='result'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, const char*, typedef __va_list_tag __va_list_tag*) -->
     <function-type size-in-bits='64' id='type-id-1154'>
@@ -26562,7 +26571,7 @@
       <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
       <parameter type-id='type-id-245' name='ap'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, const char*, ...) -->
     <function-type size-in-bits='64' id='type-id-1155'>
@@ -26572,7 +26581,7 @@
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, double*) -->
     <function-type size-in-bits='64' id='type-id-1156'>
@@ -26581,16 +26590,16 @@
       <!-- parameter of type 'double*' -->
       <parameter type-id='type-id-1072' name='result'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, int) -->
     <function-type size-in-bits='64' id='type-id-1157'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='tid'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig'/>
+      <parameter type-id='type-id-10' name='sig'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, int*) -->
     <function-type size-in-bits='64' id='type-id-1158'>
@@ -26599,16 +26608,16 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='sval'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
     <function-type size-in-bits='64' id='type-id-1159'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='len'/>
+      <parameter type-id='type-id-10' name='len'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='type'/>
       <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
       <parameter type-id='type-id-979' name='ret'/>
       <!-- parameter of type 'char*' -->
@@ -26620,18 +26629,18 @@
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='h_errnop'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, int, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1160'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='s'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pshared'/>
+      <parameter type-id='type-id-10' name='pshared'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='value'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, long int*) -->
     <function-type size-in-bits='64' id='type-id-1161'>
@@ -26640,7 +26649,7 @@
       <!-- parameter of type 'long int*' -->
       <parameter type-id='type-id-1181' name='result'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, SIZE_T, void*) -->
     <function-type size-in-bits='64' id='type-id-1162'>
@@ -26651,7 +26660,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='cpuset'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, __sanitizer::uptr) -->
     <function-type size-in-bits='64' id='type-id-1163'>
@@ -26660,7 +26669,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='len'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, long_t) -->
     <function-type size-in-bits='64' id='type-id-1164'>
@@ -26669,7 +26678,7 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void ()*) -->
     <function-type size-in-bits='64' id='type-id-1165'>
@@ -26678,7 +26687,7 @@
       <!-- parameter of type 'void ()*' -->
       <parameter type-id='type-id-125' name='f'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*) -->
     <function-type size-in-bits='64' id='type-id-31'>
@@ -26687,7 +26696,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='r'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void**) -->
     <function-type size-in-bits='64' id='type-id-1166'>
@@ -26696,7 +26705,7 @@
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-232' name='ret'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void**, SIZE_T*) -->
     <function-type size-in-bits='64' id='type-id-1167'>
@@ -26707,7 +26716,7 @@
       <!-- parameter of type 'SIZE_T*' -->
       <parameter type-id='type-id-935' name='size'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*, __sanitizer::uptr) -->
     <function-type size-in-bits='64' id='type-id-1168'>
@@ -26718,7 +26727,7 @@
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='n'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1169'>
@@ -26729,7 +26738,7 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='count'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*, void* (void*)*, void*) -->
     <function-type size-in-bits='64' id='type-id-1170'>
@@ -26742,7 +26751,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='param'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1171'>
@@ -26753,7 +26762,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='abstime'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- int (void*, void*, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1172'>
@@ -26766,7 +26775,7 @@
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='rv'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <!-- long double (long double) -->
     <function-type size-in-bits='64' id='type-id-1176'>
@@ -26811,7 +26820,7 @@
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-130' name='endptr'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='base'/>
+      <parameter type-id='type-id-10' name='base'/>
       <!-- typedef INTMAX_T -->
       <return type-id='type-id-429'/>
     </function-type>
@@ -26857,7 +26866,7 @@
     <!-- SIZE_T (int, char*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-1191'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='name'/>
+      <parameter type-id='type-id-10' name='name'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='buf'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -26926,7 +26935,7 @@
       <!-- parameter of type 'SIZE_T*' -->
       <parameter type-id='type-id-935' name='n'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='delim'/>
+      <parameter type-id='type-id-10' name='delim'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='stream'/>
       <!-- typedef SSIZE_T -->
@@ -26946,22 +26955,22 @@
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int) -->
     <function-type size-in-bits='64' id='type-id-1198'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-420'/>
     </function-type>
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
     <function-type size-in-bits='64' id='type-id-1199'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <!-- parameter of type 'typedef OFF64_T' -->
       <parameter type-id='type-id-431' name='offset'/>
       <!-- typedef SSIZE_T -->
@@ -26970,11 +26979,11 @@
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_iovec*, int, OFF_T) -->
     <function-type size-in-bits='64' id='type-id-1200'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
       <parameter type-id='type-id-991' name='iov'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <!-- parameter of type 'typedef OFF_T' -->
       <parameter type-id='type-id-432' name='offset'/>
       <!-- typedef SSIZE_T -->
@@ -26983,18 +26992,18 @@
     <!-- SSIZE_T (int, __sanitizer::__sanitizer_msghdr*, int) -->
     <function-type size-in-bits='64' id='type-id-1201'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type '__sanitizer::__sanitizer_msghdr*' -->
       <parameter type-id='type-id-997' name='msg'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- typedef SSIZE_T -->
       <return type-id='type-id-420'/>
     </function-type>
     <!-- SSIZE_T (int, void*, OFF64_T, OFF64_T) -->
     <function-type size-in-bits='64' id='type-id-1202'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr'/>
       <!-- parameter of type 'typedef OFF64_T' -->
@@ -27007,7 +27016,7 @@
     <!-- SSIZE_T (int, void*, SIZE_T) -->
     <function-type size-in-bits='64' id='type-id-1203'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -27018,7 +27027,7 @@
     <!-- SSIZE_T (int, void*, SIZE_T, OFF64_T) -->
     <function-type size-in-bits='64' id='type-id-1204'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -27031,7 +27040,7 @@
     <!-- SSIZE_T (int, void*, SIZE_T, OFF_T) -->
     <function-type size-in-bits='64' id='type-id-1205'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='ptr'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -27058,9 +27067,9 @@
     <!-- __sanitizer::uptr (int, int, void*, void*) -->
     <function-type size-in-bits='64' id='type-id-1208'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='request'/>
+      <parameter type-id='type-id-10' name='request'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='addr'/>
       <!-- parameter of type 'void*' -->
@@ -27091,31 +27100,31 @@
     <!-- long_t (int, void*, int) -->
     <function-type size-in-bits='64' id='type-id-1211'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='msg'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- typedef long_t -->
       <return type-id='type-id-438'/>
     </function-type>
     <!-- long_t (int, void*, long_t, int) -->
     <function-type size-in-bits='64' id='type-id-1212'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-1' name='buf'/>
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='len'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- typedef long_t -->
       <return type-id='type-id-438'/>
     </function-type>
     <!-- sighandler_t (int, sighandler_t) -->
     <function-type size-in-bits='64' id='type-id-1213'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='sig'/>
+      <parameter type-id='type-id-10' name='sig'/>
       <!-- parameter of type 'typedef sighandler_t' -->
       <parameter type-id='type-id-435' name='h'/>
       <!-- typedef sighandler_t -->
@@ -27140,7 +27149,7 @@
       <!-- parameter of type '__sanitizer::uptr*' -->
       <parameter type-id='type-id-131' name='env'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='val'/>
+      <parameter type-id='type-id-10' name='val'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-type>
@@ -27169,14 +27178,14 @@
     <!-- void (int) -->
     <function-type size-in-bits='64' id='type-id-210'>
       <!-- 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>
     <!-- void (int, my_siginfo_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-1219'>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <!-- parameter of type 'my_siginfo_t*' -->
       <parameter type-id='type-id-1182'/>
       <!-- parameter of type 'void*' -->
@@ -27187,7 +27196,7 @@
     <!-- void (int, void*) -->
     <function-type size-in-bits='64' id='type-id-1220'>
       <!-- 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'/>
       <!-- void -->
@@ -27245,7 +27254,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='c'/>
+      <parameter type-id='type-id-10' name='c'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='n'/>
       <!-- void* -->
@@ -27256,7 +27265,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-2' name='filename'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flag'/>
+      <parameter type-id='type-id-10' name='flag'/>
       <!-- void* -->
       <return type-id='type-id-1'/>
     </function-type>
@@ -27288,7 +27297,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* -->
@@ -27310,11 +27319,11 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='prot'/>
+      <parameter type-id='type-id-10' name='prot'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'typedef __sanitizer::u64' -->
       <parameter type-id='type-id-198' name='off'/>
       <!-- void* -->
@@ -27327,11 +27336,11 @@
       <!-- parameter of type 'typedef long_t' -->
       <parameter type-id='type-id-438' name='sz'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='prot'/>
+      <parameter type-id='type-id-10' name='prot'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-149' name='off'/>
       <!-- void* -->
@@ -27885,11 +27894,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
           <!-- int __tsan::Context::nreported -->
-          <var-decl name='nreported' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+          <var-decl name='nreported' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516832'>
           <!-- int __tsan::Context::nmissed_expected -->
-          <var-decl name='nmissed_expected' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+          <var-decl name='nmissed_expected' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516864'>
           <!-- __sanitizer::atomic_uint64_t __tsan::Context::last_symbolize_time_ns -->
@@ -27952,15 +27961,15 @@
       <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-1256'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::SignalContext::in_blocking_func -->
-          <var-decl name='in_blocking_func' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+          <var-decl name='in_blocking_func' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- int __tsan::SignalContext::int_signal_send -->
-          <var-decl name='int_signal_send' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+          <var-decl name='int_signal_send' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- int __tsan::SignalContext::pending_signal_count -->
-          <var-decl name='pending_signal_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+          <var-decl name='pending_signal_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __tsan::SignalDesc __tsan::SignalContext::pending_signals[64] -->
@@ -27981,11 +27990,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __tsan::ThreadState::ignore_reads_and_writes -->
-          <var-decl name='ignore_reads_and_writes' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
+          <var-decl name='ignore_reads_and_writes' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- int __tsan::ThreadState::ignore_sync -->
-          <var-decl name='ignore_sync' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
+          <var-decl name='ignore_sync' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- __tsan::IgnoreSet __tsan::ThreadState::mop_ignore_set -->
@@ -28049,7 +28058,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398720'>
           <!-- int __tsan::ThreadState::in_rtl -->
-          <var-decl name='in_rtl' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
+          <var-decl name='in_rtl' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398752'>
           <!-- bool __tsan::ThreadState::in_symbolizer -->
@@ -28113,7 +28122,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='3448768'>
           <!-- int __tsan::ThreadState::nomalloc -->
-          <var-decl name='nomalloc' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
+          <var-decl name='nomalloc' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::ThreadState::ThreadState(__tsan::Context*, int, int, __sanitizer::u64, __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr) -->
@@ -28123,9 +28132,9 @@
             <!-- parameter of type '__tsan::Context*' -->
             <parameter type-id='type-id-1251'/>
             <!-- 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'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -28148,9 +28157,9 @@
             <!-- parameter of type '__tsan::Context*' -->
             <parameter type-id='type-id-1251'/>
             <!-- 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'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -28207,7 +28216,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__tsan::FiredSuppression>*' -->
             <parameter type-id='type-id-1291' 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>
@@ -28512,7 +28521,7 @@
             <!-- implicit parameter of type '__tsan::FastState*' -->
             <parameter type-id='type-id-1300' 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>
@@ -28523,7 +28532,7 @@
             <!-- implicit parameter of type 'const __tsan::FastState*' -->
             <parameter type-id='type-id-1301' is-artificial='yes'/>
             <!-- int -->
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -28637,7 +28646,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- int __tsan::MutexSet::Desc::count -->
-              <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
+              <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='160'>
               <!-- bool __tsan::MutexSet::Desc::write -->
@@ -28775,7 +28784,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -28860,7 +28869,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -28924,7 +28933,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -28974,7 +28983,7 @@
             <!-- implicit parameter of type '__tsan::StackTrace*' -->
             <parameter type-id='type-id-1318' 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>
@@ -29113,7 +29122,7 @@
             <!-- implicit parameter of type '__tsan::StackTrace*' -->
             <parameter type-id='type-id-1318' 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>
@@ -29185,7 +29194,7 @@
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
             <parameter type-id='type-id-1324' 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>
@@ -29269,7 +29278,7 @@
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-99'/>
             <!-- int -->
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -29328,7 +29337,7 @@
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
             <parameter type-id='type-id-1324' 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>
@@ -29371,7 +29380,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::JmpBuf>*' -->
             <parameter type-id='type-id-1327' 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>
@@ -29518,7 +29527,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
             <parameter type-id='type-id-1334' 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>
@@ -29665,7 +29674,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
             <parameter type-id='type-id-1341' 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>
@@ -30475,7 +30484,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -30486,7 +30495,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -30497,7 +30506,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -30508,7 +30517,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -31095,7 +31104,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
           <!-- int __sanitizer::ThreadContextBase::reuse_count -->
-          <var-decl name='reuse_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
+          <var-decl name='reuse_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='928'>
           <!-- __sanitizer::u32 __sanitizer::ThreadContextBase::parent_tid -->
@@ -31122,7 +31131,7 @@
             <!-- implicit parameter of type '__sanitizer::ThreadContextBase*' -->
             <parameter type-id='type-id-1366' 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>
@@ -31225,7 +31234,7 @@
             <!-- implicit parameter of type '__sanitizer::ThreadContextBase*' -->
             <parameter type-id='type-id-1366' 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>
@@ -31325,7 +31334,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='1408'>
           <!-- int __tsan::ReportDesc::count -->
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::ReportDesc::ReportDesc() -->
@@ -31342,7 +31351,7 @@
             <!-- implicit parameter of type '__tsan::ReportDesc*' -->
             <parameter type-id='type-id-1309' 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>
@@ -31384,7 +31393,7 @@
             <!-- implicit parameter of type '__tsan::ReportDesc*' -->
             <parameter type-id='type-id-1309' 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>
@@ -31647,7 +31656,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='736'>
           <!-- int __tsan::SyncVar::owner_tid -->
-          <var-decl name='owner_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
+          <var-decl name='owner_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <!-- __sanitizer::u64 __tsan::SyncVar::last_lock -->
@@ -31655,7 +31664,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='832'>
           <!-- int __tsan::SyncVar::recursion -->
-          <var-decl name='recursion' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
+          <var-decl name='recursion' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
           <!-- bool __tsan::SyncVar::is_rw -->
@@ -32496,7 +32505,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportLocation*>*' -->
             <parameter type-id='type-id-1456' 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>
@@ -32643,7 +32652,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMop*>*' -->
             <parameter type-id='type-id-1463' 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>
@@ -32790,7 +32799,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMutex*>*' -->
             <parameter type-id='type-id-1470' 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>
@@ -32937,7 +32946,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportStack*>*' -->
             <parameter type-id='type-id-1477' 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>
@@ -33084,7 +33093,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportThread*>*' -->
             <parameter type-id='type-id-1483' 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>
@@ -33708,11 +33717,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- int __tsan::ReportStack::line -->
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
           <!-- int __tsan::ReportStack::col -->
-          <var-decl name='col' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
+          <var-decl name='col' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -33792,11 +33801,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- int __tsan::ReportLocation::tid -->
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='352'>
           <!-- int __tsan::ReportLocation::fd -->
-          <var-decl name='fd' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
+          <var-decl name='fd' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- char* __tsan::ReportLocation::name -->
@@ -33808,7 +33817,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- int __tsan::ReportLocation::line -->
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- __tsan::ReportStack* __tsan::ReportLocation::stack -->
@@ -33821,7 +33830,7 @@
       <class-decl name='ReportMop' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='45' column='1' id='type-id-1495'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::ReportMop::tid -->
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::ReportMop::addr -->
@@ -33829,7 +33838,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __tsan::ReportMop::size -->
-          <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
+          <var-decl name='size' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- bool __tsan::ReportMop::write -->
@@ -33889,7 +33898,7 @@
       <class-decl name='ReportThread' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='79' column='1' id='type-id-1500'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::ReportThread::id -->
-          <var-decl name='id' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
+          <var-decl name='id' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::ReportThread::pid -->
@@ -33905,7 +33914,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- int __tsan::ReportThread::parent_tid -->
-          <var-decl name='parent_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
+          <var-decl name='parent_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- __tsan::ReportStack* __tsan::ReportThread::stack -->
@@ -33951,7 +33960,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMopMutex>*' -->
             <parameter type-id='type-id-1530' 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>
@@ -34154,7 +34163,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>
@@ -34167,7 +34176,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>
@@ -34187,7 +34196,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'/>
         <!-- parameter of type 'bool' -->
         <parameter type-id='type-id-124'/>
         <!-- parameter of type 'bool' -->
@@ -34335,7 +34344,7 @@
         <!-- parameter of type 'const char*' -->
         <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
     <!-- namespace __tsan -->
@@ -34376,11 +34385,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __tsan::ExpectRace::hitcount -->
-          <var-decl name='hitcount' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='69' column='1'/>
+          <var-decl name='hitcount' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- int __tsan::ExpectRace::addcount -->
-          <var-decl name='addcount' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='70' column='1'/>
+          <var-decl name='addcount' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='70' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- __sanitizer::uptr __tsan::ExpectRace::addr -->
@@ -34396,7 +34405,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- int __tsan::ExpectRace::line -->
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='74' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
           <!-- char __tsan::ExpectRace::desc[128] -->
@@ -34438,7 +34447,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ExpectRace>*' -->
             <parameter type-id='type-id-1559' 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>
@@ -34570,7 +34579,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::uptr' -->
             <parameter type-id='type-id-99'/>
             <!-- void -->
@@ -34583,7 +34592,7 @@
             <!-- implicit parameter of type '__tsan::ScopedAnnotation*' -->
             <parameter type-id='type-id-1557' 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>
@@ -34604,7 +34613,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34615,7 +34624,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34626,7 +34635,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34637,7 +34646,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34648,7 +34657,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34659,7 +34668,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34672,7 +34681,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34683,7 +34692,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34694,7 +34703,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34705,7 +34714,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34718,7 +34727,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34731,7 +34740,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34742,7 +34751,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34751,7 +34760,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34764,7 +34773,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34775,7 +34784,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34784,9 +34793,9 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='enable' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
+      <parameter type-id='type-id-10' name='enable' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34795,7 +34804,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34806,7 +34815,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34817,7 +34826,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34828,7 +34837,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34839,7 +34848,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34850,7 +34859,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -34863,7 +34872,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34878,7 +34887,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -34891,7 +34900,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34900,7 +34909,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34909,7 +34918,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34918,7 +34927,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34927,7 +34936,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34936,7 +34945,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -34945,7 +34954,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34958,7 +34967,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -34971,7 +34980,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
       <!-- void -->
@@ -34982,7 +34991,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -34993,7 +35002,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <!-- void -->
@@ -35004,7 +35013,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -35017,7 +35026,7 @@
     <!-- int RunningOnValgrind() -->
     <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- double ValgrindSlowdown() -->
     <function-decl name='ValgrindSlowdown' mangled-name='ValgrindSlowdown' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ValgrindSlowdown'>
@@ -35036,7 +35045,7 @@
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -35184,7 +35193,7 @@
           <!-- implicit parameter of type 'ScopedAtomic*' -->
           <parameter type-id='type-id-1567' 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>
@@ -35215,7 +35224,7 @@
     <!-- typedef __tsan_atomic32 a32 -->
     <typedef-decl name='a32' type-id='type-id-1576' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='43' column='1' id='type-id-1577'/>
     <!-- typedef int __tsan_atomic32 -->
-    <typedef-decl name='__tsan_atomic32' type-id='type-id-8' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='24' column='1' id='type-id-1576'/>
+    <typedef-decl name='__tsan_atomic32' type-id='type-id-10' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='24' column='1' id='type-id-1576'/>
     <!-- typedef __tsan_atomic64 a64 -->
     <typedef-decl name='a64' type-id='type-id-1578' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='44' column='1' id='type-id-1579'/>
     <!-- typedef long int __tsan_atomic64 -->
@@ -35463,7 +35472,7 @@
     <!-- const char* -->
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-2'/>
     <!-- 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'/>
     <!-- const volatile a128 -->
     <qualified-type-def type-id='type-id-1587' const='yes' id='type-id-1588'/>
     <!-- const volatile a128* -->
@@ -35550,7 +35559,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 -->
@@ -35558,7 +35567,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 -->
@@ -35620,7 +35629,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
           <!-- int __sanitizer::ThreadContextBase::reuse_count -->
-          <var-decl name='reuse_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
+          <var-decl name='reuse_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='928'>
           <!-- __sanitizer::u32 __sanitizer::ThreadContextBase::parent_tid -->
@@ -35647,7 +35656,7 @@
             <!-- implicit parameter of type '__sanitizer::ThreadContextBase*' -->
             <parameter type-id='type-id-1366' 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>
@@ -35750,7 +35759,7 @@
             <!-- implicit parameter of type '__sanitizer::ThreadContextBase*' -->
             <parameter type-id='type-id-1366' 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>
@@ -37398,7 +37407,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalMmapVector<__tsan::FiredSuppression>*' -->
             <parameter type-id='type-id-1291' 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>
@@ -38183,7 +38192,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 'const char*' -->
         <parameter type-id='type-id-2'/>
         <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -38284,7 +38293,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- int __tsan::MutexSet::Desc::count -->
-              <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
+              <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='160'>
               <!-- bool __tsan::MutexSet::Desc::write -->
@@ -38469,7 +38478,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 -->
@@ -38477,7 +38486,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 -->
@@ -38485,15 +38494,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 -->
@@ -38505,11 +38514,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>
       <!-- class __tsan::DeadlockDetector -->
@@ -38595,7 +38604,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='736'>
           <!-- int __tsan::SyncVar::owner_tid -->
-          <var-decl name='owner_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
+          <var-decl name='owner_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <!-- __sanitizer::u64 __tsan::SyncVar::last_lock -->
@@ -38603,7 +38612,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='832'>
           <!-- int __tsan::SyncVar::recursion -->
-          <var-decl name='recursion' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
+          <var-decl name='recursion' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
           <!-- bool __tsan::SyncVar::is_rw -->
@@ -38704,11 +38713,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __tsan::ThreadState::ignore_reads_and_writes -->
-          <var-decl name='ignore_reads_and_writes' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
+          <var-decl name='ignore_reads_and_writes' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- int __tsan::ThreadState::ignore_sync -->
-          <var-decl name='ignore_sync' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
+          <var-decl name='ignore_sync' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- __tsan::IgnoreSet __tsan::ThreadState::mop_ignore_set -->
@@ -38772,7 +38781,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398720'>
           <!-- int __tsan::ThreadState::in_rtl -->
-          <var-decl name='in_rtl' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
+          <var-decl name='in_rtl' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398752'>
           <!-- bool __tsan::ThreadState::in_symbolizer -->
@@ -38836,7 +38845,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='3448768'>
           <!-- int __tsan::ThreadState::nomalloc -->
-          <var-decl name='nomalloc' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
+          <var-decl name='nomalloc' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::ThreadState::ThreadState(__tsan::Context*, int, int, __sanitizer::u64, __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr, __sanitizer::uptr) -->
@@ -38846,9 +38855,9 @@
             <!-- parameter of type '__tsan::Context*' -->
             <parameter type-id='type-id-1251'/>
             <!-- 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'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -38871,9 +38880,9 @@
             <!-- parameter of type '__tsan::Context*' -->
             <parameter type-id='type-id-1251'/>
             <!-- 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'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -39015,7 +39024,7 @@
             <!-- implicit parameter of type '__tsan::FastState*' -->
             <parameter type-id='type-id-1300' 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>
@@ -39026,7 +39035,7 @@
             <!-- implicit parameter of type 'const __tsan::FastState*' -->
             <parameter type-id='type-id-1301' is-artificial='yes'/>
             <!-- int -->
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -39112,7 +39121,7 @@
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
             <parameter type-id='type-id-1324' 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>
@@ -39196,7 +39205,7 @@
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-99'/>
             <!-- int -->
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -39255,7 +39264,7 @@
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
             <parameter type-id='type-id-1324' 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>
@@ -39286,7 +39295,7 @@
             <!-- implicit parameter of type '__tsan::Mutex*' -->
             <parameter type-id='type-id-1258' 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>
@@ -39377,7 +39386,7 @@
             <!-- implicit parameter of type '__tsan::Mutex*' -->
             <parameter type-id='type-id-1258' 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>
@@ -39399,11 +39408,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
           <!-- int __tsan::Context::nreported -->
-          <var-decl name='nreported' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+          <var-decl name='nreported' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516832'>
           <!-- int __tsan::Context::nmissed_expected -->
-          <var-decl name='nmissed_expected' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+          <var-decl name='nmissed_expected' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516864'>
           <!-- __sanitizer::atomic_uint64_t __tsan::Context::last_symbolize_time_ns -->
@@ -39495,7 +39504,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
             <parameter type-id='type-id-1341' 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>
@@ -39640,7 +39649,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
             <parameter type-id='type-id-1334' 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>
@@ -39780,7 +39789,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -39791,7 +39800,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -39802,7 +39811,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -39813,7 +39822,7 @@
             <!-- implicit parameter of type '__tsan::ThreadContext*' -->
             <parameter type-id='type-id-1286' 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>
@@ -39914,7 +39923,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::JmpBuf>*' -->
             <parameter type-id='type-id-1327' 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>
@@ -40028,15 +40037,15 @@
       <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-1256'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::SignalContext::in_blocking_func -->
-          <var-decl name='in_blocking_func' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+          <var-decl name='in_blocking_func' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- int __tsan::SignalContext::int_signal_send -->
-          <var-decl name='int_signal_send' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+          <var-decl name='int_signal_send' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- int __tsan::SignalContext::pending_signal_count -->
-          <var-decl name='pending_signal_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+          <var-decl name='pending_signal_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __tsan::SignalDesc __tsan::SignalContext::pending_signals[64] -->
@@ -40603,14 +40612,14 @@
         <!-- 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>
       <!-- __sanitizer::uptr __tsan::GetThreadTrace(int) -->
       <function-decl name='GetThreadTrace' filepath='../../.././libsanitizer/tsan/tsan_platform.h' line='144' 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>
@@ -40636,7 +40645,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>
@@ -40654,7 +40663,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'/>
         <!-- parameter of type 'bool' -->
         <parameter type-id='type-id-124'/>
         <!-- parameter of type 'bool' -->
@@ -41227,7 +41236,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic16_compare_exchange_strong(volatile a16*, a16*, a16, morder, morder) -->
     <function-decl name='__tsan_atomic16_compare_exchange_strong' mangled-name='__tsan_atomic16_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic16_compare_exchange_strong'>
@@ -41242,7 +41251,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic32_compare_exchange_strong(volatile a32*, a32*, a32, morder, morder) -->
     <function-decl name='__tsan_atomic32_compare_exchange_strong' mangled-name='__tsan_atomic32_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic32_compare_exchange_strong'>
@@ -41257,7 +41266,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic64_compare_exchange_strong(volatile a64*, a64*, a64, morder, morder) -->
     <function-decl name='__tsan_atomic64_compare_exchange_strong' mangled-name='__tsan_atomic64_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic64_compare_exchange_strong'>
@@ -41272,7 +41281,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic128_compare_exchange_strong(volatile a128*, a128*, a128, morder, morder) -->
     <function-decl name='__tsan_atomic128_compare_exchange_strong' mangled-name='__tsan_atomic128_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic128_compare_exchange_strong'>
@@ -41287,7 +41296,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic8_compare_exchange_weak(volatile a8*, a8*, a8, morder, morder) -->
     <function-decl name='__tsan_atomic8_compare_exchange_weak' mangled-name='__tsan_atomic8_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic8_compare_exchange_weak'>
@@ -41302,7 +41311,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic16_compare_exchange_weak(volatile a16*, a16*, a16, morder, morder) -->
     <function-decl name='__tsan_atomic16_compare_exchange_weak' mangled-name='__tsan_atomic16_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic16_compare_exchange_weak'>
@@ -41317,7 +41326,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic32_compare_exchange_weak(volatile a32*, a32*, a32, morder, morder) -->
     <function-decl name='__tsan_atomic32_compare_exchange_weak' mangled-name='__tsan_atomic32_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic32_compare_exchange_weak'>
@@ -41332,7 +41341,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic64_compare_exchange_weak(volatile a64*, a64*, a64, morder, morder) -->
     <function-decl name='__tsan_atomic64_compare_exchange_weak' mangled-name='__tsan_atomic64_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic64_compare_exchange_weak'>
@@ -41347,7 +41356,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- int __tsan_atomic128_compare_exchange_weak(volatile a128*, a128*, a128, morder, morder) -->
     <function-decl name='__tsan_atomic128_compare_exchange_weak' mangled-name='__tsan_atomic128_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic128_compare_exchange_weak'>
@@ -41362,7 +41371,7 @@
       <!-- parameter of type 'typedef morder' -->
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- a8 __tsan_atomic8_compare_exchange_val(volatile a8*, a8, a8, morder, morder) -->
     <function-decl name='__tsan_atomic8_compare_exchange_val' mangled-name='__tsan_atomic8_compare_exchange_val' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic8_compare_exchange_val'>
@@ -41524,7 +41533,7 @@
             <!-- implicit parameter of type '__tsan::ScopedJavaFunc*' -->
             <parameter type-id='type-id-1616' 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>
@@ -41587,7 +41596,7 @@
             <!-- implicit parameter of type '__tsan::BlockDesc*' -->
             <parameter type-id='type-id-1612' 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>
@@ -41606,7 +41615,7 @@
     <!-- int __tsan_java_fini() -->
     <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini'>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void __tsan_java_alloc(jptr, jptr) -->
     <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc'>
@@ -41670,7 +41679,7 @@
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1610' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-8' name='rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
+      <parameter type-id='type-id-10' name='rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-decl>
@@ -41679,7 +41688,7 @@
       <!-- parameter of type 'typedef jptr' -->
       <parameter type-id='type-id-1610' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1'/>
       <!-- 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/tsan/tsan_md5.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'>
@@ -41888,7 +41897,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__sanitizer::BlockingMutex>*' -->
             <parameter type-id='type-id-1634' 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>
@@ -43126,7 +43135,7 @@
       <!-- void __sanitizer::proc_yield(int) -->
       <function-decl name='proc_yield' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='26' 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'/>
         <!-- void -->
         <return type-id='type-id-4'/>
       </function-decl>
@@ -43210,7 +43219,7 @@
       <class-decl name='Backoff' size-in-bits='32' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='167' column='1' id='type-id-1662'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- int __tsan::Backoff::iter_ -->
-          <var-decl name='iter_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='188' column='1'/>
+          <var-decl name='iter_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='188' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static const int __tsan::Backoff::kActiveSpinIters -->
@@ -43270,7 +43279,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 -->
@@ -43279,43 +43288,43 @@
     <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1670'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int mallinfo::arena -->
-        <var-decl name='arena' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
+        <var-decl name='arena' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int mallinfo::ordblks -->
-        <var-decl name='ordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
+        <var-decl name='ordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int mallinfo::smblks -->
-        <var-decl name='smblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
+        <var-decl name='smblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int mallinfo::hblks -->
-        <var-decl name='hblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
+        <var-decl name='hblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int mallinfo::hblkhd -->
-        <var-decl name='hblkhd' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
+        <var-decl name='hblkhd' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int mallinfo::usmblks -->
-        <var-decl name='usmblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
+        <var-decl name='usmblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int mallinfo::fsmblks -->
-        <var-decl name='fsmblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
+        <var-decl name='fsmblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int mallinfo::uordblks -->
-        <var-decl name='uordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
+        <var-decl name='uordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int mallinfo::fordblks -->
-        <var-decl name='fordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='103' column='1'/>
+        <var-decl name='fordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int mallinfo::keepcost -->
-        <var-decl name='keepcost' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='104' column='1'/>
+        <var-decl name='keepcost' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- __sanitizer::InternalMmapVector<int>* -->
@@ -43347,7 +43356,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'/>
     <!-- rlimit* -->
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1677'/>
     <!-- void (const __sanitizer::SuspendedThreadsList&, void*)* -->
@@ -43361,7 +43370,7 @@
       <!-- 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'/>
       <!-- 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'/>
       <!-- class __sanitizer::InternalMmapVector<int> -->
       <class-decl name='InternalMmapVector&lt;int&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-291'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -43393,7 +43402,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>
@@ -43546,7 +43555,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalScopedBuffer<long long unsigned int>*' -->
             <parameter type-id='type-id-1672' 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>
@@ -43641,7 +43650,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'>
@@ -43763,11 +43772,11 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- int __tsan::ScopedInRtl::in_rtl_ -->
-          <var-decl name='in_rtl_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='558' column='1'/>
+          <var-decl name='in_rtl_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='558' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='96'>
           <!-- int __tsan::ScopedInRtl::errno_ -->
-          <var-decl name='errno_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='559' column='1'/>
+          <var-decl name='errno_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='559' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::ScopedInRtl::ScopedInRtl() -->
@@ -43784,7 +43793,7 @@
             <!-- implicit parameter of type '__tsan::ScopedInRtl*' -->
             <parameter type-id='type-id-1674' 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>
@@ -43804,7 +43813,7 @@
             <!-- implicit parameter of type '__tsan::ScopedInRtl*' -->
             <parameter type-id='type-id-1674' 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>
@@ -43886,9 +43895,9 @@
         <!-- 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'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <!-- int __tsan::ExtractRecvmsgFDs(void*, int*, int) -->
       <function-decl name='ExtractRecvmsgFDs' mangled-name='_ZN6__tsan17ExtractRecvmsgFDsEPvPii' filepath='../../.././libsanitizer/tsan/tsan_platform_linux.cc' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -43897,9 +43906,9 @@
         <!-- 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'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
     <!-- int getrlimit(__rlimit_resource_t, rlimit*) -->
@@ -43909,7 +43918,7 @@
       <!-- parameter of type 'rlimit*' -->
       <parameter type-id='type-id-1677'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- mallinfo __libc_mallinfo() -->
     <function-decl name='__libc_mallinfo' filepath='../../.././libsanitizer/tsan/tsan_platform_linux.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -44190,7 +44199,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>
       <!-- void __sanitizer::Printf(const char*, ...) -->
       <function-decl name='Printf' mangled-name='_ZN11__sanitizer6PrintfEPKcz' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -44212,7 +44221,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 'const char*' -->
         <parameter type-id='type-id-2'/>
         <!-- void -->
@@ -44254,11 +44263,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- int __tsan::ReportStack::line -->
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
           <!-- int __tsan::ReportStack::col -->
-          <var-decl name='col' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
+          <var-decl name='col' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
         </data-member>
       </class-decl>
       <!-- class __tsan::ReportDesc -->
@@ -44293,7 +44302,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='1408'>
           <!-- int __tsan::ReportDesc::count -->
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::ReportDesc::ReportDesc() -->
@@ -44310,7 +44319,7 @@
             <!-- implicit parameter of type '__tsan::ReportDesc*' -->
             <parameter type-id='type-id-1309' 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>
@@ -44352,7 +44361,7 @@
             <!-- implicit parameter of type '__tsan::ReportDesc*' -->
             <parameter type-id='type-id-1309' 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>
@@ -44382,11 +44391,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- int __tsan::ReportLocation::tid -->
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='352'>
           <!-- int __tsan::ReportLocation::fd -->
-          <var-decl name='fd' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
+          <var-decl name='fd' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- char* __tsan::ReportLocation::name -->
@@ -44398,7 +44407,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- int __tsan::ReportLocation::line -->
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- __tsan::ReportStack* __tsan::ReportLocation::stack -->
@@ -44409,7 +44418,7 @@
       <class-decl name='ReportMop' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='45' column='1' id='type-id-1495'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::ReportMop::tid -->
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::ReportMop::addr -->
@@ -44417,7 +44426,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- int __tsan::ReportMop::size -->
-          <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
+          <var-decl name='size' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <!-- bool __tsan::ReportMop::write -->
@@ -44509,7 +44518,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportThread*>*' -->
             <parameter type-id='type-id-1483' 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>
@@ -44669,7 +44678,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMutex*>*' -->
             <parameter type-id='type-id-1470' 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>
@@ -44783,7 +44792,7 @@
       <class-decl name='ReportThread' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='79' column='1' id='type-id-1500'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- int __tsan::ReportThread::id -->
-          <var-decl name='id' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
+          <var-decl name='id' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::ReportThread::pid -->
@@ -44799,7 +44808,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- int __tsan::ReportThread::parent_tid -->
-          <var-decl name='parent_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
+          <var-decl name='parent_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- __tsan::ReportStack* __tsan::ReportThread::stack -->
@@ -44841,7 +44850,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMop*>*' -->
             <parameter type-id='type-id-1463' 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>
@@ -45108,7 +45117,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportLocation*>*' -->
             <parameter type-id='type-id-1456' 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>
@@ -45253,7 +45262,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportStack*>*' -->
             <parameter type-id='type-id-1477' 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>
@@ -45398,7 +45407,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ReportMopMutex>*' -->
             <parameter type-id='type-id-1530' 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>
@@ -45513,7 +45522,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'/>
         <!-- const char* -->
         <return type-id='type-id-2'/>
       </function-decl>
@@ -45622,7 +45631,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__sanitizer::StaticSpinMutex>*' -->
             <parameter type-id='type-id-1693' 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>
@@ -45673,7 +45682,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__tsan::Mutex>*' -->
             <parameter type-id='type-id-1695' 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>
@@ -45702,7 +45711,7 @@
         </member-function>
       </class-decl>
       <!-- 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'/>
       <!-- typedef void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* __sanitizer::CheckFailedCallbackType -->
       <typedef-decl name='CheckFailedCallbackType' type-id='type-id-1706' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='205' column='1' id='type-id-1708'/>
       <!-- class __sanitizer::InternalScopedBuffer<char> -->
@@ -45732,7 +45741,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>
@@ -45888,7 +45897,7 @@
       <!-- void __sanitizer::SleepForSeconds(int) -->
       <function-decl name='SleepForSeconds' mangled-name='_ZN11__sanitizer15SleepForSecondsEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='178' 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'/>
         <!-- void -->
         <return type-id='type-id-4'/>
       </function-decl>
@@ -45907,7 +45916,7 @@
       <!-- void __sanitizer::SleepForMillis(int) -->
       <function-decl name='SleepForMillis' mangled-name='_ZN11__sanitizer14SleepForMillisEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='179' 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'/>
         <!-- void -->
         <return type-id='type-id-4'/>
       </function-decl>
@@ -45935,7 +45944,7 @@
       <!-- __sanitizer::uptr __tsan::GetThreadTraceHeader(int) -->
       <function-decl name='GetThreadTraceHeader' filepath='../../.././libsanitizer/tsan/tsan_platform.h' line='150' 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>
@@ -45971,7 +45980,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'/>
         <!-- parameter of type 'bool' -->
         <parameter type-id='type-id-124'/>
         <!-- parameter of type 'bool' -->
@@ -46013,7 +46022,7 @@
         <!-- parameter of type '__tsan::ThreadState*' -->
         <parameter type-id='type-id-399'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <!-- __sanitizer::u32 __tsan::CurrentStackId(__tsan::ThreadState*, __sanitizer::uptr) -->
       <function-decl name='CurrentStackId' mangled-name='_ZN6__tsan14CurrentStackIdEPNS_11ThreadStateEm' filepath='../../.././libsanitizer/tsan/tsan_rtl.cc' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -46295,7 +46304,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 'const char*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -46361,7 +46370,7 @@
       <!-- void __tsan::RestoreStack(int, __sanitizer::u64, __tsan::StackTrace*, __tsan::MutexSet*) -->
       <function-decl name='RestoreStack' mangled-name='_ZN6__tsan12RestoreStackEiyPNS_10StackTraceEPNS_8MutexSetE' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='588' 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::u64' -->
         <parameter type-id='type-id-198'/>
         <!-- parameter of type '__tsan::StackTrace*' -->
@@ -46430,7 +46439,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalScopedBuffer<long unsigned int>*' -->
             <parameter type-id='type-id-1712' 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>
@@ -46514,7 +46523,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalScopedBuffer<__tsan::MutexSet>*' -->
             <parameter type-id='type-id-1710' 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>
@@ -46587,7 +46596,7 @@
         <!-- parameter of type 'typedef __sanitizer::uptr' -->
         <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <!-- char* __sanitizer::internal_strstr(const char*, const char*) -->
       <function-decl name='internal_strstr' mangled-name='_ZN11__sanitizer15internal_strstrEPKcS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -46610,7 +46619,7 @@
       <!-- void __sanitizer::internal__exit(int) -->
       <function-decl name='internal__exit' mangled-name='_ZN11__sanitizer14internal__exitEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='84' 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'/>
         <!-- void -->
         <return type-id='type-id-4'/>
       </function-decl>
@@ -46661,7 +46670,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 'const char*' -->
         <parameter type-id='type-id-2'/>
         <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -46801,7 +46810,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>*' -->
             <parameter type-id='type-id-1724' 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>
@@ -46903,7 +46912,7 @@
             <!-- implicit parameter of type '__tsan::StackTrace*' -->
             <parameter type-id='type-id-1318' 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>
@@ -47042,7 +47051,7 @@
             <!-- implicit parameter of type '__tsan::StackTrace*' -->
             <parameter type-id='type-id-1318' 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>
@@ -47337,7 +47346,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -47422,7 +47431,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -47486,7 +47495,7 @@
             <!-- implicit parameter of type '__tsan::ScopedReport*' -->
             <parameter type-id='type-id-1310' 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>
@@ -47579,7 +47588,7 @@
             <!-- implicit parameter of type '__tsan::Vector<__tsan::ThreadLeak>*' -->
             <parameter type-id='type-id-1732' 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>
@@ -47697,7 +47706,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- int __tsan::ThreadLeak::count -->
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='142' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='142' column='1'/>
         </data-member>
       </class-decl>
       <!-- void __tsan::StatSet(__tsan::ThreadState*, __tsan::StatType, __sanitizer::u64) -->
@@ -47732,7 +47741,7 @@
         <!-- parameter of type '__tsan::ThreadState*' -->
         <parameter type-id='type-id-399'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <!-- int __tsan::ThreadCreate(__tsan::ThreadState*, __sanitizer::uptr, __sanitizer::uptr, bool) -->
       <function-decl name='ThreadCreate' mangled-name='_ZN6__tsan12ThreadCreateEPNS_11ThreadStateEmmb' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47745,14 +47754,14 @@
         <!-- 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::ThreadStart(__tsan::ThreadState*, int, __sanitizer::uptr) -->
       <function-decl name='ThreadStart' mangled-name='_ZN6__tsan11ThreadStartEPNS_11ThreadStateEim' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type '__tsan::ThreadState*' -->
         <parameter type-id='type-id-399'/>
         <!-- 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 -->
@@ -47774,7 +47783,7 @@
         <!-- parameter of type 'typedef __sanitizer::uptr' -->
         <parameter type-id='type-id-99'/>
         <!-- int -->
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <!-- void __tsan::ThreadJoin(__tsan::ThreadState*, __sanitizer::uptr, int) -->
       <function-decl name='ThreadJoin' mangled-name='_ZN6__tsan10ThreadJoinEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -47783,7 +47792,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>
@@ -47794,7 +47803,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>
@@ -47830,7 +47839,7 @@
       <!-- __tsan::Trace* __tsan::ThreadTrace(int) -->
       <function-decl name='ThreadTrace' mangled-name='_ZN6__tsan11ThreadTraceEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='752' 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'/>
         <!-- __tsan::Trace* -->
         <return type-id='type-id-1729'/>
       </function-decl>
@@ -48016,7 +48025,7 @@
     <!-- const __sanitizer::InternalScopedBuffer<__sanitizer::AddressInfo>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1745' size-in-bits='64' id='type-id-1746'/>
     <!-- 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'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::AddressInfo -->
@@ -48043,11 +48052,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() -->
@@ -48109,7 +48118,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>
@@ -48131,7 +48140,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>
@@ -48355,7 +48364,7 @@
             <!-- implicit parameter of type '__sanitizer::InternalScopedBuffer<__sanitizer::AddressInfo>*' -->
             <parameter type-id='type-id-1744' 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>
@@ -48444,7 +48453,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* -->
@@ -48569,14 +48578,14 @@
       <!-- char* __tsan::file -->
       <var-decl name='file' type-id='type-id-28' mangled-name='_ZN6__tsan4fileE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='62' column='1'/>
       <!-- int __tsan::line -->
-      <var-decl name='line' type-id='type-id-8' mangled-name='_ZN6__tsan4lineE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='63' column='1'/>
+      <var-decl name='line' type-id='type-id-10' mangled-name='_ZN6__tsan4lineE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='63' column='1'/>
       <!-- int __tsan::col -->
-      <var-decl name='col' type-id='type-id-8' mangled-name='_ZN6__tsan3colE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='64' column='1'/>
+      <var-decl name='col' type-id='type-id-10' mangled-name='_ZN6__tsan3colE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='64' column='1'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.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'>
     <!-- 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'/>
     <!-- struct dl_phdr_info -->
     <class-decl name='dl_phdr_info' size-in-bits='512' is-struct='yes' visibility='default' filepath='/usr/include/link.h' line='138' column='1' id='type-id-1747'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -48605,7 +48614,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- size_t dl_phdr_info::dlpi_tls_modid -->
-        <var-decl name='dlpi_tls_modid' type-id='type-id-15' visibility='default' filepath='/usr/include/link.h' line='157' column='1'/>
+        <var-decl name='dlpi_tls_modid' type-id='type-id-8' visibility='default' filepath='/usr/include/link.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void* dl_phdr_info::dlpi_tls_data -->
@@ -48666,7 +48675,7 @@
     <!-- typedef unsigned short int uint16_t -->
     <typedef-decl name='uint16_t' type-id='type-id-190' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-1755'/>
     <!-- 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'/>
     <!-- const Elf64_Phdr -->
     <qualified-type-def type-id='type-id-1751' const='yes' id='type-id-1756'/>
     <!-- const Elf64_Phdr* -->
@@ -48680,9 +48689,9 @@
       <!-- __sanitizer::uptr __sanitizer::internal_dup2(int, int) -->
       <function-decl name='internal_dup2' mangled-name='_ZN11__sanitizer13internal_dup2Eii' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='81' 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'/>
         <!-- typedef __sanitizer::uptr -->
         <return type-id='type-id-99'/>
       </function-decl>
@@ -48691,7 +48700,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>
@@ -48709,14 +48718,14 @@
     <!-- int getdtablesize() -->
     <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' 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>
     <!-- int pipe(int*) -->
     <function-decl name='pipe' filepath='/usr/include/unistd.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- __pid_t fork() -->
     <function-decl name='fork' filepath='/usr/include/unistd.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -48731,12 +48740,12 @@
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
       <!-- int -->
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <!-- void _exit(int) -->
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- 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>
@@ -48747,7 +48756,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'/>
       <!-- long int -->
       <return type-id='type-id-45'/>
     </function-decl>
@@ -48798,7 +48807,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedReadLock<__tsan::Mutex>*' -->
             <parameter type-id='type-id-1760' 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>
@@ -48849,7 +48858,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__tsan::MBlock>*' -->
             <parameter type-id='type-id-1758' 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>
@@ -49005,7 +49014,7 @@
         <!-- parameter of type 'long long unsigned int' -->
         <parameter type-id='type-id-156'/>
         <!-- parameter of type 'int' -->
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <!-- long long unsigned int -->
         <return type-id='type-id-156'/>
       </function-decl>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index e4b3b41b..f606d554 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -2643,20 +2643,97 @@
       </data-member>
     </class-decl>
     <!-- struct pex_obj -->
-    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-130'/>
+    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-130'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int pex_obj::flags -->
+        <var-decl name='flags' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- const char* pex_obj::pname -->
+        <var-decl name='pname' type-id='type-id-1' visibility='default' filepath='../.././libiberty/pex-common.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- const char* pex_obj::tempbase -->
+        <var-decl name='tempbase' type-id='type-id-1' visibility='default' filepath='../.././libiberty/pex-common.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- int pex_obj::next_input -->
+        <var-decl name='next_input' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- char* pex_obj::next_input_name -->
+        <var-decl name='next_input_name' type-id='type-id-52' visibility='default' filepath='../.././libiberty/pex-common.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- int pex_obj::next_input_name_allocated -->
+        <var-decl name='next_input_name_allocated' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='67' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <!-- int pex_obj::stderr_pipe -->
+        <var-decl name='stderr_pipe' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='69' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <!-- int pex_obj::count -->
+        <var-decl name='count' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <!-- pid_t* pex_obj::children -->
+        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <!-- int* pex_obj::status -->
+        <var-decl name='status' type-id='type-id-43' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <!-- pex_time* pex_obj::time -->
+        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <!-- int pex_obj::number_waited -->
+        <var-decl name='number_waited' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <!-- FILE* pex_obj::input_file -->
+        <var-decl name='input_file' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <!-- FILE* pex_obj::read_output -->
+        <var-decl name='read_output' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='83' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <!-- FILE* pex_obj::read_err -->
+        <var-decl name='read_err' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='85' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <!-- int pex_obj::remove_count -->
+        <var-decl name='remove_count' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='87' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <!-- char** pex_obj::remove -->
+        <var-decl name='remove' type-id='type-id-124' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <!-- const pex_funcs* pex_obj::funcs -->
+        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <!-- void* pex_obj::sysdep -->
+        <var-decl name='sysdep' type-id='type-id-17' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
+      </data-member>
+    </class-decl>
     <!-- union _cpp_hashnode_value -->
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-82'>
       <data-member access='private'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
-        <var-decl name='macro' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- answer* _cpp_hashnode_value::answers -->
-        <var-decl name='answers' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
-        <var-decl name='builtin' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
@@ -2664,13 +2741,15 @@
       </data-member>
     </union-decl>
     <!-- answer* -->
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
+    <!-- const pex_funcs* -->
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
     <!-- const unsigned char* -->
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
     <!-- cpp_macro* -->
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
     <!-- enum cpp_builtin_type -->
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-148'>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -2685,13 +2764,19 @@
       <enumerator name='BT_FIRST_USER' value='10'/>
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
+    <!-- pex_time* -->
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
+    <!-- pid_t* -->
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
+    <!-- const pex_funcs -->
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
     <!-- const unsigned char -->
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-150'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-154'/>
     <!-- struct answer -->
-    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-149'>
+    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- answer* answer::next -->
-        <var-decl name='next' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int answer::count -->
@@ -2699,24 +2784,45 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-152' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct pex_time -->
+    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-156'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- unsigned long int pex_time::user_seconds -->
+        <var-decl name='user_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- unsigned long int pex_time::user_microseconds -->
+        <var-decl name='user_microseconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='562' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- unsigned long int pex_time::system_seconds -->
+        <var-decl name='system_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='563' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- unsigned long int pex_time::system_microseconds -->
+        <var-decl name='system_microseconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_macro cpp_macro -->
-    <typedef-decl name='cpp_macro' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-151'/>
+    <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
+    <!-- typedef __pid_t pid_t -->
+    <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
     <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='192' id='type-id-152'>
+    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-7' id='type-id-10'/>
     </array-type-def>
     <!-- struct cpp_macro -->
-    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-153'>
+    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
         <!-- union cpp_macro::cpp_macro_u -->
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-155'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
@@ -2726,11 +2832,11 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-157' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_macro::cpp_macro_u cpp_macro::exp -->
-        <var-decl name='exp' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- source_location cpp_macro::line -->
@@ -2769,30 +2875,79 @@
         <var-decl name='extra_tokens' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
+    <!-- struct pex_funcs -->
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
+        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
+        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
+        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- int (pex_obj*, int)* pex_funcs::close -->
+        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
+        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
+        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
+        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
+        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <!-- void (pex_obj*)* pex_funcs::cleanup -->
+        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- typedef int __pid_t -->
+    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
+    <!-- FILE* (pex_obj*, int, int)* -->
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
     <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-165'/>
     <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
+    <!-- int (pex_obj*, const char*, int)* -->
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
+    <!-- int (pex_obj*, int)* -->
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
+    <!-- int (pex_obj*, int*, int)* -->
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
     <!-- struct cpp_token -->
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-154'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
       <member-type access='public'>
         <!-- union cpp_token::cpp_token_u -->
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-158'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
-            <var-decl name='source' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
-            <var-decl name='str' type-id='type-id-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
-            <var-decl name='macro_arg' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
@@ -2810,7 +2965,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <!-- unsigned short int cpp_token::flags -->
@@ -2818,11 +2973,17 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_token::cpp_token_u cpp_token::val -->
-        <var-decl name='val' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
+    <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
+    <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
+    <!-- void (pex_obj*)* -->
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
     <!-- enum cpp_ttype -->
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-162'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -2913,21 +3074,21 @@
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
     <!-- struct cpp_identifier -->
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-159'>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* cpp_identifier::node -->
         <var-decl name='node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_macro_arg -->
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-161'>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_macro_arg::arg_no -->
         <var-decl name='arg_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_string -->
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-160'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_string::len -->
         <var-decl name='len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
@@ -2940,7 +3101,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- enum __anonymous_enum__ -->
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-163'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DK_UNSPECIFIED' value='0'/>
       <enumerator name='DK_IGNORED' value='1'/>
@@ -2958,14 +3119,14 @@
       <enumerator name='DK_POP' value='13'/>
     </enum-decl>
     <!-- struct line_maps -->
-    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-164'>
+    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- maps_info line_maps::info_ordinary -->
-        <var-decl name='info_ordinary' type-id='type-id-165' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- maps_info line_maps::info_macro -->
-        <var-decl name='info_macro' type-id='type-id-165' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int line_maps::depth -->
@@ -2989,18 +3150,18 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- line_map_realloc line_maps::reallocator -->
-        <var-decl name='reallocator' type-id='type-id-166' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- line_map_round_alloc_size_func line_maps::round_alloc_size -->
-        <var-decl name='round_alloc_size' type-id='type-id-167' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct maps_info -->
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-165'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- line_map* maps_info::maps -->
-        <var-decl name='maps' type-id='type-id-168' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-190' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int maps_info::allocated -->
@@ -3016,20 +3177,20 @@
       </data-member>
     </class-decl>
     <!-- typedef void* (void*, typedef size_t)* line_map_realloc -->
-    <typedef-decl name='line_map_realloc' type-id='type-id-169' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-166'/>
+    <typedef-decl name='line_map_realloc' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-188'/>
     <!-- typedef typedef size_t (typedef size_t)* line_map_round_alloc_size_func -->
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-170' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-167'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-192' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-189'/>
     <!-- enum location_resolution_kind -->
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-171'>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-193'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
     <!-- typedef __anonymous_struct__1 expanded_location -->
-    <typedef-decl name='expanded_location' type-id='type-id-172' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-173'/>
+    <typedef-decl name='expanded_location' type-id='type-id-194' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-195'/>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-173' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-172'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-195' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-194'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-1' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -3048,15 +3209,15 @@
       </data-member>
     </class-decl>
     <!-- const line_map** -->
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-196'/>
     <!-- line_map* -->
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-190'/>
     <!-- line_maps* -->
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-197'/>
     <!-- typedef size_t (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-192'/>
     <!-- void* (void*, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-191'/>
     <!-- void default_diagnostic_finalizer(diagnostic_context*, diagnostic_info*) -->
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <!-- parameter of type 'diagnostic_context*' -->
@@ -3382,13 +3543,13 @@
     <!-- source_location linemap_resolve_location(line_maps*, source_location, location_resolution_kind, const line_map**) -->
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././gcc/../libcpp/include/line-map.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- parameter of type 'enum location_resolution_kind' -->
-      <parameter type-id='type-id-171'/>
+      <parameter type-id='type-id-193'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-174'/>
+      <parameter type-id='type-id-196'/>
       <!-- typedef source_location -->
       <return type-id='type-id-104'/>
     </function-decl>
@@ -3416,7 +3577,7 @@
     <!-- int linemap_compare_locations(line_maps*, source_location, source_location) -->
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././gcc/../libcpp/include/line-map.h' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -3429,7 +3590,7 @@
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- unsigned long int concat_length(const char*, ...) -->
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3466,7 +3627,7 @@
     <!-- int linemap_location_in_system_header_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././gcc/../libcpp/include/line-map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- int -->
@@ -3482,14 +3643,14 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- size_t (size_t) -->
-    <function-type size-in-bits='64' id='type-id-176'>
+    <function-type size-in-bits='64' id='type-id-198'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- typedef size_t -->
       <return type-id='type-id-33'/>
     </function-type>
     <!-- void* (void*, size_t) -->
-    <function-type size-in-bits='64' id='type-id-177'>
+    <function-type size-in-bits='64' id='type-id-199'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3500,7 +3661,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- enum gt_types_enum -->
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-178'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -4179,7 +4340,7 @@
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
     <!-- struct alloc_zone -->
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-179'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int alloc_zone::dummy -->
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
@@ -4188,7 +4349,7 @@
     <!-- void* ggc_alloc_typed_stat(gt_types_enum, size_t) -->
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
       <!-- parameter of type 'enum gt_types_enum' -->
-      <parameter type-id='type-id-178' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-200' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- void* -->
@@ -4209,15 +4370,15 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <!-- alloc_zone rtl_zone -->
-    <var-decl name='rtl_zone' type-id='type-id-179' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-201' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
     <!-- alloc_zone tree_zone -->
-    <var-decl name='tree_zone' type-id='type-id-179' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-201' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
     <!-- alloc_zone tree_id_zone -->
-    <var-decl name='tree_id_zone' type-id='type-id-179' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-201' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- struct linemap_stats -->
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-180'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int linemap_stats::num_ordinary_maps_allocated -->
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-22' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
@@ -4264,48 +4425,48 @@
       </data-member>
     </class-decl>
     <!-- linemap_stats* -->
-    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
     <!-- void dump_line_table_statistics() -->
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- line_maps* line_table -->
-    <var-decl name='line_table' type-id='type-id-175' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-197' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <!-- location_t input_location -->
     <var-decl name='input_location' type-id='type-id-76' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
     <!-- expanded_location linemap_expand_location(line_maps*, const line_map*, source_location) -->
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././gcc/../libcpp/include/line-map.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-49'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- void linemap_get_statistics(line_maps*, linemap_stats*) -->
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././gcc/../libcpp/include/line-map.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'linemap_stats*' -->
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-203'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- wchar_t -->
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-182'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
     <!-- typedef int nl_item -->
-    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-183'/>
+    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-205'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-184'/>
+    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-206'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
     <!-- wchar_t* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-208'/>
     <!-- size_t gcc_gettext_width(const char*) -->
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <!-- parameter of type 'const char*' -->
@@ -4356,7 +4517,7 @@
     <!-- char* nl_langinfo(nl_item) -->
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef nl_item' -->
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-205'/>
       <!-- char* -->
       <return type-id='type-id-52'/>
     </function-decl>
@@ -4372,7 +4533,7 @@
     <!-- size_t mbstowcs(wchar_t*, const char*, size_t) -->
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4383,7 +4544,7 @@
     <!-- int wcswidth(const wchar_t*, size_t) -->
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-207'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- int -->
@@ -4403,15 +4564,15 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- typedef void* iconv_t -->
-    <typedef-decl name='iconv_t' type-id='type-id-17' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-187'/>
+    <typedef-decl name='iconv_t' type-id='type-id-17' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
     <!-- const pretty_printer -->
-    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-188'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-210'/>
     <!-- const pretty_printer* -->
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
     <!-- size_t* -->
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-212'/>
     <!-- void* (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-192'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
     <!-- void pp_base_set_line_maximum_length(pretty_printer*, int) -->
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <!-- parameter of type 'pretty_printer*' -->
@@ -4445,7 +4606,7 @@
     <!-- const char* pp_base_last_position_in_text(const pretty_printer*) -->
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
       <!-- parameter of type 'const pretty_printer*' -->
-      <parameter type-id='type-id-189' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-211' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -4524,7 +4685,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-192' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-214' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <!-- void (void*)* identifier_to_locale_free -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-141' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- char* xstrerror(int) -->
@@ -4558,22 +4719,22 @@
     <!-- size_t iconv(iconv_t, char**, size_t*, char**, size_t*) -->
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-209'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-124'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-212'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-124'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-212'/>
       <!-- typedef size_t -->
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- int iconv_close(iconv_t) -->
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-209'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
@@ -4584,10 +4745,10 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- typedef iconv_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-209'/>
     </function-decl>
     <!-- void* (size_t) -->
-    <function-type size-in-bits='64' id='type-id-191'>
+    <function-type size-in-bits='64' id='type-id-213'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- void* -->
@@ -4596,27 +4757,27 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- struct symbol_stack_entry -->
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-193'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- symbol* symbol_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-194' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- symbol_stack_entry* symbol_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-195' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-217' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef symbol_hash_entry symbol -->
-    <typedef-decl name='symbol' type-id='type-id-196' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-197'/>
+    <typedef-decl name='symbol' type-id='type-id-218' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-219'/>
     <!-- struct symbol_hash_entry -->
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-196'>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-218'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* symbol_hash_entry::key -->
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_hash_entry* symbol_hash_entry::file -->
-        <var-decl name='file' type-id='type-id-198' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-220' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int symbol_hash_entry::chosen -->
@@ -4632,7 +4793,7 @@
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry -->
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-199'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file_hash_entry::key -->
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
@@ -4655,55 +4816,55 @@
       </data-member>
     </class-decl>
     <!-- struct file_stack_entry -->
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-200'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-222'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- file* file_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-201' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_stack_entry* file_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-202' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-224' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef file_hash_entry file -->
-    <typedef-decl name='file' type-id='type-id-199' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-203'/>
+    <typedef-decl name='file' type-id='type-id-221' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-225'/>
     <!-- typedef unsigned int hashval_t -->
-    <typedef-decl name='hashval_t' type-id='type-id-16' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-204'/>
+    <typedef-decl name='hashval_t' type-id='type-id-16' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-226'/>
     <!-- typedef htab* htab_t -->
-    <typedef-decl name='htab_t' type-id='type-id-205' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-206'/>
+    <typedef-decl name='htab_t' type-id='type-id-227' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-228'/>
     <!-- typedef typedef hashval_t (void*)* htab_hash -->
-    <typedef-decl name='htab_hash' type-id='type-id-207' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-208'/>
+    <typedef-decl name='htab_hash' type-id='type-id-229' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-230'/>
     <!-- typedef int (void*, void*)* htab_eq -->
-    <typedef-decl name='htab_eq' type-id='type-id-209' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-210'/>
+    <typedef-decl name='htab_eq' type-id='type-id-231' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-232'/>
     <!-- typedef void (void*)* htab_del -->
-    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-211'/>
+    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-233'/>
     <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
-    <typedef-decl name='htab_alloc' type-id='type-id-212' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-213'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-234' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-235'/>
     <!-- typedef void (void*)* htab_free -->
-    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-214'/>
+    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-236'/>
     <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-215' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-216'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-237' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-238'/>
     <!-- typedef void (void*, void*)* htab_free_with_arg -->
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-217' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-218'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-239' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-240'/>
     <!-- enum insert_option -->
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-219'>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-241'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
     <!-- struct htab -->
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-220'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-242'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- htab_hash htab::hash_f -->
-        <var-decl name='hash_f' type-id='type-id-208' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-230' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- htab_eq htab::eq_f -->
-        <var-decl name='eq_f' type-id='type-id-210' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- htab_del htab::del_f -->
-        <var-decl name='del_f' type-id='type-id-211' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-233' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void** htab::entries -->
@@ -4731,11 +4892,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- htab_alloc htab::alloc_f -->
-        <var-decl name='alloc_f' type-id='type-id-213' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- htab_free htab::free_f -->
-        <var-decl name='free_f' type-id='type-id-214' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-236' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- void* htab::alloc_arg -->
@@ -4743,11 +4904,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- htab_alloc_with_arg htab::alloc_with_arg_f -->
-        <var-decl name='alloc_with_arg_f' type-id='type-id-216' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-238' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- htab_free_with_arg htab::free_with_arg_f -->
-        <var-decl name='free_with_arg_f' type-id='type-id-218' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-240' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- unsigned int htab::size_prime_index -->
@@ -4755,52 +4916,52 @@
       </data-member>
     </class-decl>
     <!-- file* -->
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-223'/>
     <!-- file_hash_entry* -->
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-220'/>
     <!-- file_stack_entry* -->
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-224'/>
     <!-- htab* -->
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-227'/>
     <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-209'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-231'/>
     <!-- symbol* -->
-    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-216'/>
     <!-- symbol_stack_entry* -->
-    <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-217'/>
     <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-229'/>
     <!-- void (void*, void*)* -->
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-239'/>
     <!-- void* (typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-234'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-59' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- symbol_stack_entry* symbol_stack -->
-    <var-decl name='symbol_stack' type-id='type-id-195' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-217' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <!-- obstack file_stack_obstack -->
     <var-decl name='file_stack_obstack' type-id='type-id-59' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
     <!-- file_stack_entry* file_stack -->
-    <var-decl name='file_stack' type-id='type-id-202' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-224' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <!-- hashval_t htab_hash_string(void*) -->
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-204'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <!-- void** htab_find_slot_with_hash(htab_t, void*, hashval_t, insert_option) -->
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-204'/>
+      <parameter type-id='type-id-226'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-241'/>
       <!-- void** -->
       <return type-id='type-id-101'/>
     </function-decl>
@@ -4849,13 +5010,13 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-230'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210'/>
+      <parameter type-id='type-id-232'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-233'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-206'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <!-- char* getpwd() -->
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4881,7 +5042,7 @@
       <return type-id='type-id-52'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-221'>
+    <function-type size-in-bits='64' id='type-id-243'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'void*' -->
@@ -4890,14 +5051,14 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-222'>
+    <function-type size-in-bits='64' id='type-id-244'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-204'/>
+      <return type-id='type-id-226'/>
     </function-type>
     <!-- void (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-223'>
+    <function-type size-in-bits='64' id='type-id-245'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'void*' -->
@@ -4906,7 +5067,7 @@
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void* (size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-224'>
+    <function-type size-in-bits='64' id='type-id-246'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4915,7 +5076,7 @@
       <return type-id='type-id-17'/>
     </function-type>
     <!-- void* (void*, size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-225'>
+    <function-type size-in-bits='64' id='type-id-247'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -5106,104 +5267,104 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='248' id='type-id-226'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='248' id='type-id-248'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-7' id='type-id-227'/>
+      <subrange length='31' type-id='type-id-7' id='type-id-249'/>
     </array-type-def>
     <!-- char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='48' id='type-id-228'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='48' id='type-id-250'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-7' id='type-id-229'/>
+      <subrange length='6' type-id='type-id-7' id='type-id-251'/>
     </array-type-def>
     <!-- char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='56' id='type-id-230'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='56' id='type-id-252'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-7' id='type-id-231'/>
+      <subrange length='7' type-id='type-id-7' id='type-id-253'/>
     </array-type-def>
     <!-- const char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='248' id='type-id-232'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='248' id='type-id-254'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-7' id='type-id-227'/>
+      <subrange length='31' type-id='type-id-7' id='type-id-249'/>
     </array-type-def>
     <!-- const char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-233'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-255'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-7' id='type-id-229'/>
+      <subrange length='6' type-id='type-id-7' id='type-id-251'/>
     </array-type-def>
     <!-- const char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-234'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-256'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-7' id='type-id-231'/>
+      <subrange length='7' type-id='type-id-7' id='type-id-253'/>
     </array-type-def>
     <!-- const char version_string[6] -->
-    <var-decl name='version_string' type-id='type-id-233' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
+    <var-decl name='version_string' type-id='type-id-255' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
     <!-- const char pkgversion_string[7] -->
-    <var-decl name='pkgversion_string' type-id='type-id-234' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-256' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
     <!-- const char bug_report_url[31] -->
-    <var-decl name='bug_report_url' type-id='type-id-232' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='bug_report_url' type-id='type-id-254' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const uchar** -->
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
     <!-- void cpp_init_iconv(cpp_reader*) -->
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void _cpp_destroy_iconv(cpp_reader*) -->
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- cppchar_t cpp_host_to_exec_charset(cpp_reader*, cppchar_t) -->
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- parameter of type 'typedef cppchar_t' -->
-      <parameter type-id='type-id-238' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-260' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const uchar**, const uchar*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar**' -->
-      <parameter type-id='type-id-236' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-258' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-257' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-239' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <parameter type-id='type-id-261' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <!-- bool cpp_interpret_string(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-262'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-181'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-257' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- cpp_hashnode* -->
@@ -5212,21 +5373,21 @@
     <!-- uchar* _cpp_convert_input(cpp_reader*, const char*, uchar*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-242' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-264' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-243' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-265' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-244' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-266' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <!-- const char* _cpp_default_encoding() -->
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
@@ -5234,32 +5395,32 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-262'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-257'/>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-265'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-259'/>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-263'/>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-261'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-266'/>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-238'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-264'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-245'/>
+    <qualified-type-def type-id='type-id-270' const='yes' id='type-id-267'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-246'/>
+    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-268'/>
     <!-- struct normalize_state -->
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-249'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -5267,19 +5428,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-253' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-247'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-275' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-269'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-248'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-270'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-250'/>
+    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-272'/>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-251'/>
+    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-273'/>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-252'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-274'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -5287,21 +5448,21 @@
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct cpp_reader -->
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-253'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-275'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-254'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-276'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -5311,19 +5472,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-175' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -5331,31 +5492,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -5367,39 +5528,39 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-266' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -5415,11 +5576,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -5427,15 +5588,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
         <!-- cpp_token* cpp_reader::cur_token -->
-        <var-decl name='cur_token' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
-        <var-decl name='base_run' type-id='type-id-268' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -5447,7 +5608,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -5455,23 +5616,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
@@ -5483,15 +5644,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
-        <var-decl name='deps' type-id='type-id-271' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -5503,31 +5664,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-272' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-273' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -5535,7 +5696,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
@@ -5551,7 +5712,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -5559,11 +5720,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -5571,129 +5732,129 @@
       </data-member>
     </class-decl>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-280'/>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-287'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-289'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-283'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-278'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-285'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-300'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-302'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-293'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-288'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-274'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-296'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-297'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-294'/>
     <!-- struct cpp_callbacks -->
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-273'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-296' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-298' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-299' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-300' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-302' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-259'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-281'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-307'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-329'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-308'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-330'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-310'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -5706,20 +5867,20 @@
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-330' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-311'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-333'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -5729,34 +5890,34 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-329' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
-        <var-decl name='buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-264'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -5780,29 +5941,29 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-276'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-298'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-318'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-340'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -5828,7 +5989,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -5996,7 +6157,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-252' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -6008,7 +6169,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -6048,14 +6209,14 @@
       </data-member>
     </class-decl>
     <!-- struct cset_converter -->
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-270'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
-        <var-decl name='cd' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -6063,7 +6224,7 @@
       </data-member>
     </class-decl>
     <!-- struct lexer_state -->
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-257'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-279'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -6122,7 +6283,7 @@
       </data-member>
     </class-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-277'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -6141,31 +6302,31 @@
       </data-member>
     </class-decl>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-269'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-291'/>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-279'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-345' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-301'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-262'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-284'/>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-268'/>
+    <typedef-decl name='tokenrun' type-id='type-id-344' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-290'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-277'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-328'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-326'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-337'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-336'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-349' const='yes' id='type-id-305'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-284'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-306'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-325'/>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-320'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-342'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -6181,44 +6342,44 @@
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-313'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-335'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-319'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-341'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-322'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-334'/>
     <!-- struct _cpp_buff -->
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-281'>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct _cpp_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-282'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-304'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -6237,23 +6398,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-263' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-285' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -6289,7 +6450,7 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-285'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -6312,7 +6473,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-354' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -6328,11 +6489,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
@@ -6340,7 +6501,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -6364,20 +6525,20 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_savedstate -->
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-286'/>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-308'/>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-287'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -6385,7 +6546,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -6405,10 +6566,10 @@
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-288'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-310'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -6420,7 +6581,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -6432,11 +6593,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
-        <var-decl name='vpathlv' type-id='type-id-190' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -6448,24 +6609,24 @@
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry_pool -->
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-289'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'/>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-290'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-59' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
-        <var-decl name='alloc_subobject' type-id='type-id-192' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -6477,7 +6638,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-237' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -6493,14 +6654,14 @@
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-291'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-337' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-359' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -6508,35 +6669,35 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-162' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-292'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-314'/>
     <!-- struct tokenrun -->
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-322'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- cpp_token* tokenrun::limit -->
-        <var-decl name='limit' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-279' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-323'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-345'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -6548,79 +6709,79 @@
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-339' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-321'/>
+    <typedef-decl name='convert_f' type-id='type-id-361' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-343'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-317'/>
+    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-339'/>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-316'/>
+    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-338'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-340' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-302'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-362' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-324'/>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-309'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-331'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-363' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-327'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-317'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-323'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-316'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-321'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-320'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-318'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-319'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-354'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-361'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-358'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-363'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-360'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-356'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-355'/>
     <!-- struct directive -->
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-328'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-350'/>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-327'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-349'/>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-337'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-359'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-357'/>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-360' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-331'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-353'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-354'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-376'/>
     <!-- struct cpp_num -->
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-358'>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -6632,9 +6793,9 @@
       </data-member>
     </class-decl>
     <!-- struct if_stack -->
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-357'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-360'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-353' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -6649,15 +6810,15 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-351'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-373'/>
     <!-- typedef __anonymous_struct__2 cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-355'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-364' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-356'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-386'/>
     <!-- struct _cpp_line_note -->
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-362'>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
@@ -6668,7 +6829,7 @@
       </data-member>
     </class-decl>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-363'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -6679,17 +6840,17 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef void (cpp_reader*)* pragma_cb -->
-    <typedef-decl name='pragma_cb' type-id='type-id-305' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-365'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-327' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
     <!-- typedef cpp_options cpp_options -->
-    <typedef-decl name='cpp_options' type-id='type-id-276' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-366'/>
+    <typedef-decl name='cpp_options' type-id='type-id-298' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-388'/>
     <!-- typedef cpp_callbacks cpp_callbacks -->
-    <typedef-decl name='cpp_callbacks' type-id='type-id-273' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-367'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-295' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-389'/>
     <!-- enum include_type -->
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-368'>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-390'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
@@ -6697,28 +6858,28 @@
       <enumerator name='IT_CMDLINE' value='3'/>
     </enum-decl>
     <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
-    <typedef-decl name='cpp_cb' type-id='type-id-369' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-370'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-391' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-392'/>
     <!-- cpp_callbacks* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-393'/>
     <!-- cpp_options* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-394'/>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-263'/>
     <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-391'/>
     <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-374'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-396'/>
     <!-- void cpp_undef_all(cpp_reader*) -->
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void _cpp_do_file_change(cpp_reader*, lc_reason, const char*, linenum_type, unsigned int) -->
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -6733,13 +6894,13 @@
     <!-- void cpp_register_pragma(cpp_reader*, const char*, const char*, pragma_cb, bool) -->
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'typedef pragma_cb' -->
-      <parameter type-id='type-id-365' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-387' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-5' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- void -->
@@ -6748,7 +6909,7 @@
     <!-- void cpp_register_deferred_pragma(cpp_reader*, const char*, const char*, unsigned int, bool, bool) -->
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -6765,21 +6926,21 @@
     <!-- void _cpp_init_internal_pragmas(cpp_reader*) -->
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- char** _cpp_save_pragma_names(cpp_reader*) -->
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <!-- char** -->
       <return type-id='type-id-124'/>
     </function-decl>
     <!-- void _cpp_restore_pragma_names(cpp_reader*, char**) -->
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-124' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- void -->
@@ -6788,59 +6949,59 @@
     <!-- int _cpp_test_assertion(cpp_reader*, unsigned int*) -->
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-374' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-396' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- cpp_options* cpp_get_options(cpp_reader*) -->
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
       <!-- cpp_options* -->
-      <return type-id='type-id-372'/>
+      <return type-id='type-id-394'/>
     </function-decl>
     <!-- cpp_callbacks* cpp_get_callbacks(cpp_reader*) -->
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
       <!-- cpp_callbacks* -->
-      <return type-id='type-id-371'/>
+      <return type-id='type-id-393'/>
     </function-decl>
     <!-- void cpp_set_callbacks(cpp_reader*, cpp_callbacks*) -->
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- parameter of type 'cpp_callbacks*' -->
-      <parameter type-id='type-id-371' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-393' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- deps* cpp_get_deps(cpp_reader*) -->
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
       <!-- deps* -->
-      <return type-id='type-id-271'/>
+      <return type-id='type-id-293'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const uchar*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-257' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <!-- void cpp_unassert(cpp_reader*, const char*) -->
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -6849,7 +7010,7 @@
     <!-- void cpp_assert(cpp_reader*, const char*) -->
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -6858,7 +7019,7 @@
     <!-- void cpp_undef(cpp_reader*, const char*) -->
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -6867,7 +7028,7 @@
     <!-- void _cpp_define_builtin(cpp_reader*, const char*) -->
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -6876,7 +7037,7 @@
     <!-- void cpp_define(cpp_reader*, const char*) -->
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -6885,7 +7046,7 @@
     <!-- void cpp_define_formatted(cpp_reader*, const char*, ...) -->
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
@@ -6895,14 +7056,14 @@
     <!-- void _cpp_init_directives(cpp_reader*) -->
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- cpp_hashnode* cpp_lookup(cpp_reader*, const unsigned char*, unsigned int) -->
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/include/cpplib.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'unsigned int' -->
@@ -6913,16 +7074,16 @@
     <!-- unsigned char* cpp_output_line_to_string(cpp_reader*, const unsigned char*) -->
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/include/cpplib.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- bool cpp_warning_with_line_syshdr(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -6938,7 +7099,7 @@
     <!-- bool _cpp_parse_expr(cpp_reader*, bool) -->
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-5'/>
       <!-- bool -->
@@ -6947,7 +7108,7 @@
     <!-- void _cpp_overlay_buffer(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -6969,20 +7130,20 @@
     <!-- bool _cpp_stack_include(cpp_reader*, const char*, int, include_type) -->
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'enum include_type' -->
-      <parameter type-id='type-id-368'/>
+      <parameter type-id='type-id-390'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int _cpp_compare_file_date(cpp_reader*, const char*, int) -->
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -6993,7 +7154,7 @@
     <!-- cpp_hashnode* _cpp_lex_identifier(cpp_reader*, const char*) -->
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- cpp_hashnode* -->
@@ -7002,16 +7163,16 @@
     <!-- void _cpp_mark_file_once_only(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_make_system_header(cpp_reader*, int, int) -->
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/include/cpplib.h' line='1006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
@@ -7022,9 +7183,9 @@
     <!-- void cpp_forall_identifiers(cpp_reader*, cpp_cb, void*) -->
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/include/cpplib.h' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef cpp_cb' -->
-      <parameter type-id='type-id-370'/>
+      <parameter type-id='type-id-392'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- void -->
@@ -7033,22 +7194,22 @@
     <!-- bool cpp_interpret_string_notranslate(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-262'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-263'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-181'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void _cpp_fake_include(cpp_reader*, const char*) -->
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -7057,14 +7218,14 @@
     <!-- deps* deps_init() -->
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/include/mkdeps.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
       <!-- deps* -->
-      <return type-id='type-id-271'/>
+      <return type-id='type-id-293'/>
     </function-decl>
     <!-- void _cpp_pop_file_buffer(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -7078,9 +7239,9 @@
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- int (cpp_reader*, cpp_hashnode*, void*) -->
-    <function-type size-in-bits='64' id='type-id-373'>
+    <function-type size-in-bits='64' id='type-id-395'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile'/>
+      <parameter type-id='type-id-259' name='pfile'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -7093,7 +7254,7 @@
     <!-- bool cpp_warning_syshdr(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -7114,16 +7275,16 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-337'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-359'/>
     <!-- struct cpp_num -->
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-358'>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -7135,9 +7296,9 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-238'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
     <!-- unsigned int cpp_interpret_float_suffix(const char*, size_t) -->
     <function-decl name='cpp_interpret_float_suffix' mangled-name='_Z26cpp_interpret_float_suffixPKcm' filepath='../.././libcpp/expr.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26cpp_interpret_float_suffixPKcm'>
       <!-- parameter of type 'const char*' -->
@@ -7159,120 +7320,120 @@
     <!-- cpp_ttype cpp_userdef_string_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_remove_type' mangled-name='_Z30cpp_userdef_string_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z30cpp_userdef_string_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_string_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_add_type' mangled-name='_Z27cpp_userdef_string_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_userdef_string_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_remove_type' mangled-name='_Z28cpp_userdef_char_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_userdef_char_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_add_type' mangled-name='_Z25cpp_userdef_char_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_userdef_char_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-162'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <!-- bool cpp_userdef_string_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_p' mangled-name='_Z20cpp_userdef_string_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_userdef_string_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- bool cpp_userdef_char_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_p' mangled-name='_Z18cpp_userdef_char_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_userdef_char_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- const char* cpp_get_userdef_suffix(const cpp_token*) -->
     <function-decl name='cpp_get_userdef_suffix' mangled-name='_Z22cpp_get_userdef_suffixPK9cpp_token' filepath='../.././libcpp/expr.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_get_userdef_suffixPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-358' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- unsigned int cpp_classify_number(cpp_reader*, const cpp_token*, const char**) -->
     <function-decl name='cpp_classify_number' mangled-name='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc' filepath='../.././libcpp/expr.c' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-314' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-336' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- cpp_num cpp_interpret_integer(cpp_reader*, const cpp_token*, unsigned int) -->
     <function-decl name='cpp_interpret_integer' mangled-name='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj' filepath='../.././libcpp/expr.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-337'/>
+      <return type-id='type-id-359'/>
     </function-decl>
     <!-- op* _cpp_expand_op_stack(cpp_reader*) -->
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
       <!-- op* -->
-      <return type-id='type-id-275'/>
+      <return type-id='type-id-297'/>
     </function-decl>
     <!-- cpp_num cpp_num_sign_extend(cpp_num, size_t) -->
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
       <!-- parameter of type 'typedef cpp_num' -->
-      <parameter type-id='type-id-337' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-359' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-337'/>
+      <return type-id='type-id-359'/>
     </function-decl>
     <!-- cppchar_t cpp_interpret_charconst(cpp_reader*, const cpp_token*, unsigned int*, int*) -->
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/include/cpplib.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-396'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-43'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-260'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-375'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-397'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-377' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-378'/>
+    <typedef-decl name='ssize_t' type-id='type-id-399' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-400'/>
     <!-- typedef long int __ssize_t -->
-    <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-377'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-399'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-250'/>
+    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-272'/>
     <!-- typedef __dirstream DIR -->
-    <typedef-decl name='DIR' type-id='type-id-379' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-380'/>
+    <typedef-decl name='DIR' type-id='type-id-401' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-402'/>
     <!-- struct dirent -->
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-381'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-403'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __ino_t dirent::d_ino -->
         <var-decl name='d_ino' type-id='type-id-65' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
@@ -7291,51 +7452,51 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
         <!-- char dirent::d_name[256] -->
-        <var-decl name='d_name' type-id='type-id-375' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-397' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef int (void*, void*)* __compar_fn_t -->
-    <typedef-decl name='__compar_fn_t' type-id='type-id-209' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-382'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-231' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-404'/>
     <!-- typedef int (void**, void*)* htab_trav -->
-    <typedef-decl name='htab_trav' type-id='type-id-383' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-384'/>
+    <typedef-decl name='htab_trav' type-id='type-id-405' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-406'/>
     <!-- DIR* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-385'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-407'/>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-265'/>
     <!-- dirent* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-408'/>
     <!-- int (void**, void*)* -->
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-405'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-266'/>
     <!-- bool _cpp_find_failed(_cpp_file*) -->
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-287' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- _cpp_file* _cpp_find_file(cpp_reader*, const char*, cpp_dir*, bool, int) -->
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-263' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-285' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-5' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-265'/>
+      <return type-id='type-id-287'/>
     </function-decl>
     <!-- bool _cpp_stack_file(cpp_reader*, _cpp_file*, bool) -->
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-287' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-5' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- bool -->
@@ -7344,7 +7505,7 @@
     <!-- bool cpp_included(cpp_reader*, const char*) -->
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -7353,7 +7514,7 @@
     <!-- bool cpp_included_before(cpp_reader*, const char*, source_location) -->
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7364,28 +7525,28 @@
     <!-- void _cpp_init_files(cpp_reader*) -->
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void _cpp_cleanup_files(cpp_reader*) -->
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_clear_file_cache(cpp_reader*) -->
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_change_file(cpp_reader*, lc_reason, const char*) -->
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -7396,14 +7557,14 @@
     <!-- void _cpp_report_missing_guards(cpp_reader*) -->
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- bool cpp_push_include(cpp_reader*, const char*) -->
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -7412,11 +7573,11 @@
     <!-- void cpp_set_include_chains(cpp_reader*, cpp_dir*, cpp_dir*, int) -->
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-263' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-285' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-263' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-285' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <!-- void -->
@@ -7425,28 +7586,28 @@
     <!-- const char* cpp_get_path(_cpp_file*) -->
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- cpp_dir* cpp_get_dir(_cpp_file*) -->
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <parameter type-id='type-id-287' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
       <!-- cpp_dir* -->
-      <return type-id='type-id-263'/>
+      <return type-id='type-id-285'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_prev(cpp_buffer*) -->
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-256' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <parameter type-id='type-id-278' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <!-- bool _cpp_save_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -7455,7 +7616,7 @@
     <!-- bool _cpp_read_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -7492,7 +7653,7 @@
     <!-- void deps_add_dep(deps*, const char*) -->
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/include/mkdeps.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -7527,56 +7688,56 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-378'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <!-- unsigned char* _cpp_convert_input(cpp_reader*, const char*, unsigned char*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-277'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-265'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-266'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- DIR* opendir(const char*) -->
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- DIR* -->
-      <return type-id='type-id-385'/>
+      <return type-id='type-id-407'/>
     </function-decl>
     <!-- dirent* readdir(DIR*) -->
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-385'/>
+      <parameter type-id='type-id-407'/>
       <!-- dirent* -->
-      <return type-id='type-id-386'/>
+      <return type-id='type-id-408'/>
     </function-decl>
     <!-- int closedir(DIR*) -->
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-385'/>
+      <parameter type-id='type-id-407'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void* htab_find_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-204'/>
+      <parameter type-id='type-id-226'/>
       <!-- void* -->
       <return type-id='type-id-17'/>
     </function-decl>
@@ -7591,7 +7752,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-382'/>
+      <parameter type-id='type-id-404'/>
       <!-- void* -->
       <return type-id='type-id-17'/>
     </function-decl>
@@ -7600,22 +7761,22 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-230'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210'/>
+      <parameter type-id='type-id-232'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211'/>
+      <parameter type-id='type-id-233'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-213'/>
+      <parameter type-id='type-id-235'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-214'/>
+      <parameter type-id='type-id-236'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-206'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <!-- void htab_delete(htab_t) -->
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -7628,23 +7789,23 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-382'/>
+      <parameter type-id='type-id-404'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- size_t htab_elements(htab_t) -->
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <!-- typedef size_t -->
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- void htab_traverse(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-384'/>
+      <parameter type-id='type-id-406'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- void -->
@@ -7682,7 +7843,7 @@
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- int (void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-387'>
+    <function-type size-in-bits='64' id='type-id-409'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-101'/>
       <!-- parameter of type 'void*' -->
@@ -7691,33 +7852,33 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- struct __dirstream -->
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
-    <typedef-decl name='ht_cb' type-id='type-id-388' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-389'/>
+    <typedef-decl name='ht_cb' type-id='type-id-410' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-411'/>
     <!-- int (cpp_reader*, typedef hashnode, void*)* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-410'/>
     <!-- void _cpp_destroy_hashtable(cpp_reader*) -->
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int cpp_defined(cpp_reader*, const unsigned char*, int) -->
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'int' -->
@@ -7728,7 +7889,7 @@
     <!-- void ht_destroy(hash_table*) -->
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/include/symtab.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -7737,93 +7898,93 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16'/>
       <!-- hash_table* -->
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-413'/>
     </function-decl>
     <!-- void ht_forall(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/include/symtab.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-389'/>
+      <parameter type-id='type-id-411'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int (cpp_reader*, hashnode, void*) -->
-    <function-type size-in-bits='64' id='type-id-390'>
+    <function-type size-in-bits='64' id='type-id-412'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef hashnode' -->
-      <parameter type-id='type-id-356'/>
+      <parameter type-id='type-id-378'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-290' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-392'/>
+    <typedef-decl name='hash_table' type-id='type-id-312' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-150' size-in-bits='2048' id='type-id-393'>
+    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-415'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <!-- unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='2048' id='type-id-394'>
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='2048' id='type-id-416'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <!-- void cpp_set_lang(cpp_reader*, c_lang) -->
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-320' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-342' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- cpp_reader* cpp_create_reader(c_lang, hash_table*, line_maps*) -->
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-320' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-342' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
       <!-- cpp_reader* -->
-      <return type-id='type-id-237'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <!-- void cpp_set_line_map(cpp_reader*, line_maps*) -->
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_destroy(cpp_reader*) -->
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_init_special_builtins(cpp_reader*) -->
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void cpp_init_builtins(cpp_reader*, int) -->
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -7832,14 +7993,14 @@
     <!-- void cpp_post_options(cpp_reader*) -->
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- const char* cpp_read_main_file(cpp_reader*, const char*) -->
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- const char* -->
@@ -7848,21 +8009,21 @@
     <!-- void cpp_finish(cpp_reader*, FILE*) -->
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- unsigned char _cpp_trigraph_map[256] -->
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-394' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-416' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- struct normalize_state -->
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-249'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -7870,13 +8031,13 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_context cpp_context -->
-    <typedef-decl name='cpp_context' type-id='type-id-259' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-395'/>
+    <typedef-decl name='cpp_context' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-417'/>
     <!-- enum cpp_token_fld_kind -->
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-396'>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-418'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -7887,13 +8048,13 @@
       <enumerator name='CPP_TOKEN_FLD_NONE' value='6'/>
     </enum-decl>
     <!-- cpp_comment_table* -->
-    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-419'/>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-261'/>
     <!-- int cpp_ideq(const cpp_token*, const char*) -->
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- int -->
@@ -7907,14 +8068,14 @@
     <!-- cpp_comment_table* cpp_get_comments(cpp_reader*) -->
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
       <!-- cpp_comment_table* -->
-      <return type-id='type-id-397'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <!-- void _cpp_init_tokenrun(tokenrun*, unsigned int) -->
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
       <!-- parameter of type 'tokenrun*' -->
-      <parameter type-id='type-id-269' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-291' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- void -->
@@ -7923,14 +8084,14 @@
     <!-- int _cpp_remaining_tokens_num_in_context(cpp_context*) -->
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
       <!-- parameter of type 'cpp_context*' -->
-      <parameter type-id='type-id-260' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-282' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- const char* cpp_type2name(cpp_ttype, unsigned char) -->
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- parameter of type 'unsigned char' -->
       <parameter type-id='type-id-28' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- const char* -->
@@ -7939,7 +8100,7 @@
     <!-- void cpp_output_token(const cpp_token*, FILE*) -->
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- void -->
@@ -7948,18 +8109,18 @@
     <!-- int cpp_avoid_paste(cpp_reader*, const cpp_token*, const cpp_token*) -->
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-358' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-358' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void cpp_output_line(cpp_reader*, FILE*) -->
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
@@ -7968,14 +8129,14 @@
     <!-- cpp_token_fld_kind cpp_token_val_index(cpp_token*) -->
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
       <!-- parameter of type 'cpp_token*' -->
-      <parameter type-id='type-id-156' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <parameter type-id='type-id-164' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <!-- enum cpp_token_fld_kind -->
-      <return type-id='type-id-396'/>
+      <return type-id='type-id-418'/>
     </function-decl>
     <!-- void cpp_force_token_locations(cpp_reader*, source_location*) -->
     <function-decl name='cpp_force_token_locations' mangled-name='_Z25cpp_force_token_locationsP10cpp_readerPj' filepath='../.././libcpp/lex.c' line='2910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_force_token_locationsP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-259' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-118' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- void -->
@@ -7984,29 +8145,29 @@
     <!-- void cpp_stop_forcing_token_locations(cpp_reader*) -->
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const unsigned char**, const unsigned char*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-265'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-261'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -8017,7 +8178,7 @@
     <!-- hashnode ht_lookup_with_hash(hash_table*, const unsigned char*, size_t, unsigned int, ht_lookup_option) -->
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -8025,9 +8186,9 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-398'/>
+      <parameter type-id='type-id-420'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-356'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <!-- void* memmove(void*, void*, size_t) -->
     <function-decl name='memmove' filepath='/usr/include/string.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8043,12 +8204,12 @@
     <!-- const char* cpp_named_operator2name(cpp_ttype) -->
     <function-decl name='cpp_named_operator2name' mangled-name='cpp_named_operator2name' filepath='../.././libcpp/internal.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpp_named_operator2name'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-181'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-398'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-420'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -8056,30 +8217,30 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='192' id='type-id-152'>
+    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-7' id='type-id-10'/>
     </array-type-def>
     <!-- struct cpp_token -->
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-154'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
       <member-type access='public'>
         <!-- union cpp_token::cpp_token_u -->
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-158'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
-            <var-decl name='source' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
-            <var-decl name='str' type-id='type-id-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
-            <var-decl name='macro_arg' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
@@ -8097,7 +8258,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <!-- unsigned short int cpp_token::flags -->
@@ -8105,7 +8266,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_token::cpp_token_u cpp_token::val -->
-        <var-decl name='val' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct ht_identifier -->
@@ -8134,15 +8295,15 @@
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-82'>
       <data-member access='private'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
-        <var-decl name='macro' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- answer* _cpp_hashnode_value::answers -->
-        <var-decl name='answers' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
-        <var-decl name='builtin' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
@@ -8150,33 +8311,33 @@
       </data-member>
     </union-decl>
     <!-- typedef cpp_macro cpp_macro -->
-    <typedef-decl name='cpp_macro' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-151'/>
+    <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-262'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-284'/>
     <!-- struct cpp_identifier -->
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-159'>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* cpp_identifier::node -->
         <var-decl name='node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-327'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-349'/>
     <!-- struct cpp_macro_arg -->
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-161'>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_macro_arg::arg_no -->
         <var-decl name='arg_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_macro -->
-    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-153'>
+    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
         <!-- union cpp_macro::cpp_macro_u -->
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-155'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
@@ -8186,11 +8347,11 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-157' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_macro::cpp_macro_u cpp_macro::exp -->
-        <var-decl name='exp' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- source_location cpp_macro::line -->
@@ -8230,7 +8391,7 @@
       </data-member>
     </class-decl>
     <!-- enum cpp_ttype -->
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-162'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -8321,10 +8482,10 @@
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
     <!-- struct answer -->
-    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-149'>
+    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- answer* answer::next -->
-        <var-decl name='next' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int answer::count -->
@@ -8332,11 +8493,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-152' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum cpp_builtin_type -->
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-148'>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -8352,7 +8513,7 @@
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
     <!-- struct cpp_string -->
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-160'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_string::len -->
         <var-decl name='len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
@@ -8363,35 +8524,35 @@
       </data-member>
     </class-decl>
     <!-- answer* -->
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
     <!-- const unsigned char -->
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-150'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-154'/>
     <!-- const unsigned char* -->
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
     <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-165'/>
     <!-- cpp_macro* -->
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
     <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
     <!-- void linemap_init(line_maps*) -->
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void linemap_check_files_exited(line_maps*) -->
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- const line_map* linemap_add(line_maps*, lc_reason, unsigned int, const char*, linenum_type) -->
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8406,14 +8567,14 @@
     <!-- bool linemap_tracks_macro_expansion_locs_p(line_maps*) -->
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- const line_map* linemap_enter_macro(line_maps*, cpp_hashnode*, source_location, unsigned int) -->
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8439,7 +8600,7 @@
     <!-- source_location linemap_line_start(line_maps*, linenum_type, unsigned int) -->
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-116' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8450,7 +8611,7 @@
     <!-- source_location linemap_position_for_column(line_maps*, unsigned int) -->
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- typedef source_location -->
@@ -8459,7 +8620,7 @@
     <!-- source_location linemap_position_for_line_and_column(line_map*, linenum_type, unsigned int) -->
     <function-decl name='linemap_position_for_line_and_column' mangled-name='_Z36linemap_position_for_line_and_columnP8line_mapjj' filepath='../.././libcpp/line-map.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z36linemap_position_for_line_and_columnP8line_mapjj'>
       <!-- parameter of type 'line_map*' -->
-      <parameter type-id='type-id-168' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
+      <parameter type-id='type-id-190' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-116' name='line' filepath='../.././libcpp/line-map.c' line='496' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8470,7 +8631,7 @@
     <!-- const line_map* linemap_lookup(line_maps*, source_location) -->
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- const line_map* -->
@@ -8486,7 +8647,7 @@
     <!-- int linemap_get_expansion_line(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- int -->
@@ -8495,7 +8656,7 @@
     <!-- const char* linemap_get_expansion_filename(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <!-- const char* -->
@@ -8511,7 +8672,7 @@
     <!-- bool linemap_location_from_macro_expansion_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <!-- bool -->
@@ -8520,11 +8681,11 @@
     <!-- source_location linemap_unwind_toward_expansion(line_maps*, source_location, const line_map**) -->
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-174' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-196' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <!-- typedef source_location -->
       <return type-id='type-id-104'/>
     </function-decl>
@@ -8533,7 +8694,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'bool' -->
@@ -8544,7 +8705,7 @@
     <!-- void linemap_dump_location(line_maps*, source_location, FILE*) -->
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <!-- parameter of type 'FILE*' -->
@@ -8557,7 +8718,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -8577,7 +8738,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- struct _cpp_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-282'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-304'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -8596,23 +8757,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-263' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-285' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -8648,21 +8809,21 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_reader -->
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-253'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-275'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-254'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-276'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -8672,19 +8833,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-175' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -8692,31 +8853,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -8728,39 +8889,39 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-266' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -8776,11 +8937,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -8788,15 +8949,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
         <!-- cpp_token* cpp_reader::cur_token -->
-        <var-decl name='cur_token' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
-        <var-decl name='base_run' type-id='type-id-268' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -8808,7 +8969,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -8816,23 +8977,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
@@ -8844,15 +9005,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
-        <var-decl name='deps' type-id='type-id-271' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -8864,31 +9025,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-272' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-273' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -8896,7 +9057,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
@@ -8912,7 +9073,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -8920,11 +9081,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -8932,10 +9093,10 @@
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-288'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-310'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -8947,7 +9108,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -8959,11 +9120,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
-        <var-decl name='vpathlv' type-id='type-id-190' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -8975,11 +9136,11 @@
       </data-member>
     </class-decl>
     <!-- typedef cpp_buffer cpp_buffer -->
-    <typedef-decl name='cpp_buffer' type-id='type-id-285' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-399'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-307' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-421'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-351'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-373'/>
     <!-- struct _cpp_line_note -->
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-362'>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
@@ -8990,10 +9151,10 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-264'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -9017,34 +9178,34 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-316'/>
+    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-338'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-317'/>
+    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-339'/>
     <!-- struct cset_converter -->
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-270'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
-        <var-decl name='cd' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -9052,9 +9213,9 @@
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-339' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-321'/>
+    <typedef-decl name='convert_f' type-id='type-id-361' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-343'/>
     <!-- struct lexer_state -->
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-257'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-279'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -9113,22 +9274,22 @@
       </data-member>
     </class-decl>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-290'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-59' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
-        <var-decl name='alloc_subobject' type-id='type-id-192' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -9140,7 +9301,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-237' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -9156,53 +9317,53 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_buff _cpp_buff -->
-    <typedef-decl name='_cpp_buff' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-400'/>
+    <typedef-decl name='_cpp_buff' type-id='type-id-303' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-422'/>
     <!-- struct _cpp_buff -->
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-281'>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct tokenrun -->
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-322'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- cpp_token* tokenrun::limit -->
-        <var-decl name='limit' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-276'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-298'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-318'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-340'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -9228,7 +9389,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -9396,7 +9557,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-252' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -9408,7 +9569,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -9448,14 +9609,14 @@
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-291'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-337' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-359' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -9463,30 +9624,30 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-162' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-259'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-281'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-307'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-329'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-308'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-330'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-310'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -9499,20 +9660,20 @@
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-330' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-311'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-333'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -9522,44 +9683,44 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-329' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
-        <var-decl name='buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-309'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-331'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-363' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-360' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-331'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-353'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-360'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-353' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -9574,89 +9735,89 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_callbacks -->
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-273'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-296' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-298' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-299' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-300' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-302' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-313'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-335'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-285'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -9679,7 +9840,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-354' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -9695,11 +9856,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
@@ -9707,7 +9868,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -9731,36 +9892,36 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-268'/>
+    <typedef-decl name='tokenrun' type-id='type-id-344' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-290'/>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-253' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-247'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-275' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-269'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-248'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-270'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-340' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-302'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-362' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-324'/>
     <!-- typedef cpp_dir cpp_dir -->
-    <typedef-decl name='cpp_dir' type-id='type-id-264' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-401'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-286' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-423'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-364' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-356'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-290' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-392'/>
+    <typedef-decl name='hash_table' type-id='type-id-312' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-319'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-341'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-320'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-342'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -9776,7 +9937,7 @@
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-252'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-274'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -9784,7 +9945,7 @@
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-277'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -9803,12 +9964,12 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-279'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-345' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-301'/>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-279' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-323'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-345'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -9820,9 +9981,9 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__2 cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-355'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-363'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -9833,10 +9994,10 @@
       </data-member>
     </class-decl>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-287'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -9844,7 +10005,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -9864,11 +10025,11 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-251'/>
+    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-273'/>
     <!-- typedef __time_t time_t -->
-    <typedef-decl name='time_t' type-id='type-id-83' filepath='/usr/include/time.h' line='76' column='1' id='type-id-402'/>
+    <typedef-decl name='time_t' type-id='type-id-83' filepath='/usr/include/time.h' line='76' column='1' id='type-id-424'/>
     <!-- struct tm -->
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-403'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-425'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
         <var-decl name='tm_sec' type-id='type-id-2' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -9915,137 +10076,137 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_file _cpp_file -->
-    <typedef-decl name='_cpp_file' type-id='type-id-282' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-404'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-304' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-426'/>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-280'/>
     <!-- _cpp_buff** -->
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-427'/>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-287'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-354'/>
     <!-- _cpp_strbuf* -->
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-328'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-326'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-361'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-337'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-336'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-349' const='yes' id='type-id-305'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-289'/>
     <!-- const cpp_macro -->
-    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-408'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-430'/>
     <!-- const cpp_macro* -->
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-409'/>
+    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-245'/>
+    <qualified-type-def type-id='type-id-270' const='yes' id='type-id-267'/>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-262'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-354'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-376'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-358'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-363'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-284'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-306'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-283'/>
     <!-- const time_t -->
-    <qualified-type-def type-id='type-id-402' const='yes' id='type-id-410'/>
+    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-432'/>
     <!-- const time_t* -->
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-433'/>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-412'/>
+    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-434'/>
     <!-- const tm* -->
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-246'/>
+    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-268'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-257'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-256'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-278'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-360'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-285'/>
     <!-- cpp_dir** -->
-    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-436'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-325'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-259'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-300'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-302'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-293'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-288'/>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-356'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-274'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-296'/>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-364'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-386'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-355'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-322'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-334'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-297'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-294'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-437'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-416'/>
+    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-438'/>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-269'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-291'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-357'/>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-264'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-277'/>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-327'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-317'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-323'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-316'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-321'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-320'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-318'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-319'/>
     <!-- int _cpp_warn_if_unused_macro(cpp_reader*, cpp_hashnode*, void*) -->
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -10056,31 +10217,31 @@
     <!-- const uchar* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- const uchar* -->
-      <return type-id='type-id-235'/>
+      <return type-id='type-id-257'/>
     </function-decl>
     <!-- uchar* cpp_quote_string(uchar*, const uchar*, unsigned int) -->
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-242' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-264' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-257' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <!-- bool _cpp_arguments_ok(cpp_reader*, cpp_macro*, const cpp_hashnode*, unsigned int) -->
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-146' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'const cpp_hashnode*' -->
-      <parameter type-id='type-id-267' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-289' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- bool -->
@@ -10089,11 +10250,11 @@
     <!-- void _cpp_push_token_context(cpp_reader*, cpp_hashnode*, const cpp_token*, unsigned int) -->
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-358' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- void -->
@@ -10102,11 +10263,11 @@
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const uchar*, size_t) -->
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- void -->
@@ -10115,21 +10276,21 @@
     <!-- void _cpp_pop_context(cpp_reader*) -->
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int cpp_sys_macro_p(cpp_reader*) -->
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void _cpp_backup_tokens_direct(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -10138,7 +10299,7 @@
     <!-- void _cpp_backup_tokens(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -10147,23 +10308,23 @@
     <!-- const cpp_token* cpp_get_token_with_location(cpp_reader*, source_location*) -->
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-118' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <!-- const cpp_token* cpp_get_token(cpp_reader*) -->
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <!-- void cpp_scan_nooutput(cpp_reader*) -->
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -10177,9 +10338,9 @@
     <!-- bool _cpp_save_parameter(cpp_reader*, cpp_macro*, cpp_hashnode*) -->
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-146' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- bool -->
@@ -10188,7 +10349,7 @@
     <!-- bool _cpp_create_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117'/>
       <!-- bool -->
@@ -10197,7 +10358,7 @@
     <!-- const unsigned char* cpp_macro_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
@@ -10210,16 +10371,16 @@
     <!-- cpp_token* _cpp_temp_token(cpp_reader*) -->
     <function-decl name='_cpp_temp_token' mangled-name='_cpp_temp_token' filepath='../.././libcpp/internal.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_temp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-156'/>
+      <return type-id='type-id-164'/>
     </function-decl>
     <!-- void _cpp_extend_buff(cpp_reader*, _cpp_buff**, size_t) -->
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type '_cpp_buff**' -->
-      <parameter type-id='type-id-405'/>
+      <parameter type-id='type-id-427'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- void -->
@@ -10228,7 +10389,7 @@
     <!-- bool cpp_error(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -10240,14 +10401,14 @@
     <!-- cpp_token* _cpp_lex_direct(cpp_reader*) -->
     <function-decl name='_cpp_lex_direct' mangled-name='_cpp_lex_direct' filepath='../.././libcpp/internal.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-156'/>
+      <return type-id='type-id-164'/>
     </function-decl>
     <!-- bool cpp_warning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -10263,14 +10424,14 @@
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-415'/>
+      <parameter type-id='type-id-437'/>
       <!-- typedef time_t -->
-      <return type-id='type-id-402'/>
+      <return type-id='type-id-424'/>
     </function-decl>
     <!-- bool cpp_errno(cpp_reader*, int, const char*) -->
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/include/cpplib.h' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -10281,58 +10442,58 @@
     <!-- tm* localtime(const time_t*) -->
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const time_t*' -->
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-433'/>
       <!-- tm* -->
-      <return type-id='type-id-416'/>
+      <return type-id='type-id-438'/>
     </function-decl>
     <!-- unsigned char* _cpp_unaligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- const char* _cpp_get_file_name(_cpp_file*) -->
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const tm*' -->
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-435'/>
       <!-- char* -->
       <return type-id='type-id-52'/>
     </function-decl>
     <!-- stat* _cpp_get_file_stat(_cpp_file*) -->
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <!-- stat* -->
       <return type-id='type-id-132'/>
     </function-decl>
     <!-- _cpp_file* cpp_get_file(cpp_buffer*) -->
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/include/cpplib.h' line='1012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-256'/>
+      <parameter type-id='type-id-278'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-265'/>
+      <return type-id='type-id-287'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_buffer(cpp_reader*) -->
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/include/cpplib.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const unsigned char*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/include/cpplib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -10340,98 +10501,98 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <!-- void _cpp_clean_line(cpp_reader*) -->
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void _cpp_pop_buffer(cpp_reader*) -->
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- int _cpp_do__Pragma(cpp_reader*) -->
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void _cpp_free_buff(_cpp_buff*) -->
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-280'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- unsigned char* cpp_token_as_text(cpp_reader*, const cpp_token*) -->
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- unsigned int cpp_token_len(const cpp_token*) -->
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- unsigned int -->
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- unsigned char* cpp_spell_token(cpp_reader*, const cpp_token*, unsigned char*, bool) -->
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/include/cpplib.h' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-277'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-5'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_get_buff(cpp_reader*, size_t) -->
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-258'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_append_extend_buff(cpp_reader*, _cpp_buff*, size_t) -->
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-280'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-258'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- void _cpp_release_buff(cpp_reader*, _cpp_buff*) -->
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-280'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- bool cpp_warning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -10443,48 +10604,48 @@
     <!-- const cpp_token* cpp_peek_token(cpp_reader*, int) -->
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/include/cpplib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <!-- const cpp_token* _cpp_lex_token(cpp_reader*) -->
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <!-- bool _cpp_read_logical_line_trad(cpp_reader*) -->
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int _cpp_equiv_tokens(const cpp_token*, const cpp_token*) -->
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- bool _cpp_expansions_different_trad(const cpp_macro*, const cpp_macro*) -->
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- bool cpp_pedwarning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -10500,7 +10661,7 @@
     <!-- bool cpp_error_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -10516,7 +10677,7 @@
     <!-- bool cpp_pedwarning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -10528,50 +10689,50 @@
     <!-- bool _cpp_create_trad_definition(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-146'/>
+      <parameter type-id='type-id-149'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- unsigned char* _cpp_aligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- size_t _cpp_replacement_text_len(const cpp_macro*) -->
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
       <!-- typedef size_t -->
       <return type-id='type-id-33'/>
     </function-decl>
     <!-- unsigned char* _cpp_copy_replacement_text(const cpp_macro*, unsigned char*) -->
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-277'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <!-- bool (cpp_reader*, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-324'>
+    <function-type size-in-bits='64' id='type-id-346'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-type>
     <!-- bool (cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-325'>
+    <function-type size-in-bits='64' id='type-id-347'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
@@ -10588,51 +10749,51 @@
       <return type-id='type-id-5'/>
     </function-type>
     <!-- bool (iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
-    <function-type size-in-bits='64' id='type-id-352'>
+    <function-type size-in-bits='64' id='type-id-374'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-209'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type '_cpp_strbuf*' -->
-      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-429'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-type>
     <!-- char* (const char*, cpp_dir*) -->
-    <function-type size-in-bits='64' id='type-id-326'>
+    <function-type size-in-bits='64' id='type-id-348'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-285'/>
       <!-- char* -->
       <return type-id='type-id-52'/>
     </function-type>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**) -->
-    <function-type size-in-bits='64' id='type-id-353'>
+    <function-type size-in-bits='64' id='type-id-375'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'cpp_dir**' -->
-      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-436'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*) -->
-    <function-type size-in-bits='64' id='type-id-329'>
+    <function-type size-in-bits='64' id='type-id-351'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- cpp_hashnode* -->
       <return type-id='type-id-117'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-330'>
+    <function-type size-in-bits='64' id='type-id-352'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -10641,32 +10802,32 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-359'>
+    <function-type size-in-bits='64' id='type-id-381'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-356'/>
+      <return type-id='type-id-378'/>
     </function-type>
     <!-- void (cpp_reader*) -->
-    <function-type size-in-bits='64' id='type-id-342'>
+    <function-type size-in-bits='64' id='type-id-364'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-343'>
+    <function-type size-in-bits='64' id='type-id-365'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, const char*, int, const char*) -->
-    <function-type size-in-bits='64' id='type-id-344'>
+    <function-type size-in-bits='64' id='type-id-366'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -10677,49 +10838,49 @@
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, const cpp_token*, int) -->
-    <function-type size-in-bits='64' id='type-id-345'>
+    <function-type size-in-bits='64' id='type-id-367'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, const line_map*) -->
-    <function-type size-in-bits='64' id='type-id-346'>
+    <function-type size-in-bits='64' id='type-id-368'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-49'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, source_location) -->
-    <function-type size-in-bits='64' id='type-id-347'>
+    <function-type size-in-bits='64' id='type-id-369'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const cpp_string*) -->
-    <function-type size-in-bits='64' id='type-id-348'>
+    <function-type size-in-bits='64' id='type-id-370'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-262'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
-    <function-type size-in-bits='64' id='type-id-349'>
+    <function-type size-in-bits='64' id='type-id-371'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- parameter of type 'const unsigned char*' -->
@@ -10729,14 +10890,14 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const cpp_token**' -->
-      <parameter type-id='type-id-341'/>
+      <parameter type-id='type-id-363'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-350'>
+    <function-type size-in-bits='64' id='type-id-372'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-104'/>
       <!-- parameter of type 'cpp_hashnode*' -->
@@ -10745,24 +10906,24 @@
       <return type-id='type-id-32'/>
     </function-type>
     <!-- struct _cpp_strbuf -->
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-406'/>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-428'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const deps -->
-    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-417'/>
+    <qualified-type-def type-id='type-id-310' const='yes' id='type-id-439'/>
     <!-- const deps* -->
-    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-440'/>
     <!-- void deps_free(deps*) -->
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-293' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void deps_add_target(deps*, const char*, int) -->
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-293' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'int' -->
@@ -10773,7 +10934,7 @@
     <!-- void deps_add_default_target(deps*, const char*) -->
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -10782,7 +10943,7 @@
     <!-- void deps_add_vpath(deps*, const char*) -->
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -10791,7 +10952,7 @@
     <!-- void deps_write(const deps*, FILE*, unsigned int) -->
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-418' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-440' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -10802,7 +10963,7 @@
     <!-- void deps_phony_targets(const deps*, FILE*) -->
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-418' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-440' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- void -->
@@ -10811,7 +10972,7 @@
     <!-- int deps_save(deps*, FILE*) -->
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-293' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- int -->
@@ -10820,7 +10981,7 @@
     <!-- int deps_restore(deps*, FILE*, const char*) -->
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-271' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-293' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-90' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -10833,9 +10994,9 @@
     <!-- void ht_purge(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-389'/>
+      <parameter type-id='type-id-411'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17'/>
       <!-- void -->
@@ -10844,9 +11005,9 @@
     <!-- void ht_load(hash_table*, hashnode*, unsigned int, unsigned int, bool) -->
     <function-decl name='ht_load' mangled-name='_Z7ht_loadP2htPP13ht_identifierjjb' filepath='../.././libcpp/symtab.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z7ht_loadP2htPP13ht_identifierjjb'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-413' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'hashnode*' -->
-      <parameter type-id='type-id-334' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-356' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-16' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -10859,7 +11020,7 @@
     <!-- void ht_dump_statistics(hash_table*) -->
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -10873,7 +11034,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-398'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-420'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -10881,9 +11042,9 @@
     <!-- void _cpp_overlay_buffer(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-235' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- void -->
@@ -10892,45 +11053,45 @@
     <!-- void _cpp_remove_overlay(cpp_reader*) -->
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- bool _cpp_scan_out_logical_line(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-146'/>
+      <parameter type-id='type-id-149'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- uchar* _cpp_copy_replacement_text(const cpp_macro*, uchar*) -->
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-409' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-431' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-242' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-264' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <!-- hashnode ht_lookup(hash_table*, const unsigned char*, size_t, ht_lookup_option) -->
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <!-- parameter of type 'const unsigned char*' -->
       <parameter type-id='type-id-145'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-398'/>
+      <parameter type-id='type-id-420'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-356'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117'/>
       <!-- parameter of type 'const unsigned char*' -->
@@ -10943,7 +11104,7 @@
     <!-- const unsigned char* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
@@ -10952,14 +11113,14 @@
     <!-- bool _cpp_skip_block_comment(cpp_reader*) -->
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int _cpp_handle_directive(cpp_reader*, int) -->
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- int -->
@@ -10968,7 +11129,7 @@
     <!-- void _cpp_process_line_notes(cpp_reader*, int) -->
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -10977,7 +11138,7 @@
     <!-- bool _cpp_get_fresh_line(cpp_reader*) -->
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <!-- bool -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -11108,40 +11269,40 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-419' size-in-bits='8448' id='type-id-420'>
+    <array-type-def dimensions='1' type-id='type-id-441' size-in-bits='8448' id='type-id-442'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-7' id='type-id-421'/>
+      <subrange length='33' type-id='type-id-7' id='type-id-443'/>
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-422' size-in-bits='11136' id='type-id-423'>
+    <array-type-def dimensions='1' type-id='type-id-444' size-in-bits='11136' id='type-id-445'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-7' id='type-id-424'/>
+      <subrange length='58' type-id='type-id-7' id='type-id-446'/>
     </array-type-def>
     <!-- demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-425' size-in-bits='8448' id='type-id-426'>
+    <array-type-def dimensions='1' type-id='type-id-447' size-in-bits='8448' id='type-id-448'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-7' id='type-id-421'/>
+      <subrange length='33' type-id='type-id-7' id='type-id-443'/>
     </array-type-def>
     <!-- demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-427' size-in-bits='11136' id='type-id-428'>
+    <array-type-def dimensions='1' type-id='type-id-449' size-in-bits='11136' id='type-id-450'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-7' id='type-id-424'/>
+      <subrange length='58' type-id='type-id-7' id='type-id-446'/>
     </array-type-def>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-429'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-451'/>
     <!-- struct demangle_component -->
-    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-430'>
+    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-452'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component_type demangle_component::type -->
-        <var-decl name='type' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-453' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} demangle_component::u -->
-        <var-decl name='u' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-454' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum demangle_component_type -->
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-431'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-453'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -11216,58 +11377,58 @@
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-432'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-454'>
       <data-member access='private'>
         <!-- struct {const char* s; int len;} s_name -->
-        <var-decl name='s_name' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-455' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
-        <var-decl name='s_operator' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-456' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
-        <var-decl name='s_extended_operator' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-457' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
-        <var-decl name='s_fixed' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-458' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
-        <var-decl name='s_ctor' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-459' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
-        <var-decl name='s_dtor' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
-        <var-decl name='s_builtin' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const char* string; int len;} s_string -->
-        <var-decl name='s_string' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {long int number;} s_number -->
-        <var-decl name='s_number' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int character;} s_character -->
-        <var-decl name='s_character' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
-        <var-decl name='s_binary' type-id='type-id-443' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
-        <var-decl name='s_unary_num' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {const char* s; int len;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-433'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-455'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* s -->
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
@@ -11278,14 +11439,14 @@
       </data-member>
     </class-decl>
     <!-- struct {const demangle_operator_info* op;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-434'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-456'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_operator_info* op -->
-        <var-decl name='op' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_operator_info -->
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-427'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-449'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_operator_info::code -->
         <var-decl name='code' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
@@ -11304,44 +11465,44 @@
       </data-member>
     </class-decl>
     <!-- struct {int args; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-435'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-457'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int args -->
         <var-decl name='args' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* length; short int accum; short int sat;} -->
-    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-436'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-458'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* length -->
-        <var-decl name='length' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- short int accum -->
-        <var-decl name='accum' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
         <!-- short int sat -->
-        <var-decl name='sat' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-437'>
+    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_ctor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_ctor_kinds -->
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-447'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-469'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
@@ -11349,18 +11510,18 @@
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
     <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-438'>
+    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-460'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_dtor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-470' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_dtor_kinds -->
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-448'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-470'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
@@ -11368,14 +11529,14 @@
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
     <!-- struct {const demangle_builtin_type_info* type;} -->
-    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-439'>
+    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-461'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_builtin_type_info* type -->
-        <var-decl name='type' type-id='type-id-449' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-471' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_builtin_type_info -->
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-425'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-447'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_builtin_type_info::name -->
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
@@ -11394,11 +11555,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- d_builtin_type_print demangle_builtin_type_info::print -->
-        <var-decl name='print' type-id='type-id-450' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-472' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum d_builtin_type_print -->
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-450'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-472'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -11412,7 +11573,7 @@
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
     <!-- struct {const char* string; int len;} -->
-    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-440'>
+    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-462'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* string -->
         <var-decl name='string' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
@@ -11423,35 +11584,35 @@
       </data-member>
     </class-decl>
     <!-- struct {long int number;} -->
-    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-441'>
+    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int number -->
         <var-decl name='number' type-id='type-id-22' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {int character;} -->
-    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-442'>
+    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-464'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int character -->
         <var-decl name='character' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* left; demangle_component* right;} -->
-    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-443'>
+    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-465'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* left -->
-        <var-decl name='left' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* right -->
-        <var-decl name='right' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* sub; int num;} -->
-    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-444'>
+    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-466'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* sub -->
-        <var-decl name='sub' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int num -->
@@ -11459,7 +11620,7 @@
       </data-member>
     </class-decl>
     <!-- struct d_info -->
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-451'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-473'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* d_info::s -->
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
@@ -11478,7 +11639,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- demangle_component* d_info::comps -->
-        <var-decl name='comps' type-id='type-id-446' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int d_info::next_comp -->
@@ -11490,7 +11651,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- demangle_component** d_info::subs -->
-        <var-decl name='subs' type-id='type-id-452' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-474' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int d_info::next_sub -->
@@ -11506,7 +11667,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- demangle_component* d_info::last_name -->
-        <var-decl name='last_name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int d_info::expansion -->
@@ -11514,31 +11675,31 @@
       </data-member>
     </class-decl>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
-    <typedef-decl name='demangle_callbackref' type-id='type-id-453' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-454'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-475' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-476'/>
     <!-- const demangle_builtin_type_info -->
-    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-419'/>
+    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-441'/>
     <!-- const demangle_builtin_type_info* -->
-    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-471'/>
     <!-- const demangle_component -->
-    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-477'/>
     <!-- const demangle_component* -->
-    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-478'/>
     <!-- const demangle_operator_info -->
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-422'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-444'/>
     <!-- const demangle_operator_info* -->
-    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-467'/>
     <!-- d_info* -->
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-479'/>
     <!-- demangle_component* -->
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-468'/>
     <!-- demangle_component** -->
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-474'/>
     <!-- void (const char*, typedef size_t, void*)* -->
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-475'/>
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'int' -->
@@ -11549,60 +11710,60 @@
     <!-- int cplus_demangle_fill_extended_operator(demangle_component*, int, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int cplus_demangle_fill_ctor(demangle_component*, gnu_v3_ctor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
       <!-- parameter of type 'enum gnu_v3_ctor_kinds' -->
-      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-469' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int cplus_demangle_fill_dtor(demangle_component*, gnu_v3_dtor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
       <!-- parameter of type 'enum gnu_v3_dtor_kinds' -->
-      <parameter type-id='type-id-448' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-470' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_type(d_info*) -->
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-446'/>
+      <return type-id='type-id-468'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_mangled_name(d_info*, int) -->
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-446'/>
+      <return type-id='type-id-468'/>
     </function-decl>
     <!-- int cplus_demangle_print_callback(int, const demangle_component*, demangle_callbackref, void*) -->
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- int -->
@@ -11613,11 +11774,11 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-190' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-212' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- char* -->
       <return type-id='type-id-52'/>
     </function-decl>
@@ -11630,7 +11791,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -11641,7 +11802,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- int -->
@@ -11652,7 +11813,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- int -->
@@ -11663,19 +11824,19 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
       <!-- enum gnu_v3_ctor_kinds -->
-      <return type-id='type-id-447'/>
+      <return type-id='type-id-469'/>
     </function-decl>
     <!-- gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor(const char*) -->
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
       <!-- enum gnu_v3_dtor_kinds -->
-      <return type-id='type-id-448'/>
+      <return type-id='type-id-470'/>
     </function-decl>
     <!-- const demangle_operator_info cplus_demangle_operators[58] -->
-    <var-decl name='cplus_demangle_operators' type-id='type-id-423' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <var-decl name='cplus_demangle_operators' type-id='type-id-445' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
     <!-- const demangle_builtin_type_info cplus_demangle_builtin_types[33] -->
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-420' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-442' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <!-- void* realloc(void*, size_t) -->
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -11686,7 +11847,7 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <!-- void (const char*, size_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-458'>
+    <function-type size-in-bits='64' id='type-id-480'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -11699,17 +11860,17 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-459' size-in-bits='2112' id='type-id-460'>
+    <array-type-def dimensions='1' type-id='type-id-481' size-in-bits='2112' id='type-id-482'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-7' id='type-id-461'/>
+      <subrange length='11' type-id='type-id-7' id='type-id-483'/>
     </array-type-def>
     <!-- demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-462' size-in-bits='2112' id='type-id-463'>
+    <array-type-def dimensions='1' type-id='type-id-484' size-in-bits='2112' id='type-id-485'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-7' id='type-id-461'/>
+      <subrange length='11' type-id='type-id-7' id='type-id-483'/>
     </array-type-def>
     <!-- enum demangling_styles -->
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-464'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-486'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -11724,26 +11885,26 @@
       <enumerator name='gnat_demangling' value='32768'/>
     </enum-decl>
     <!-- struct demangler_engine -->
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-462'>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-484'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* const demangler_engine::demangling_style_name -->
-        <var-decl name='demangling_style_name' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const demangling_styles demangler_engine::demangling_style -->
-        <var-decl name='demangling_style' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-488' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char* const demangler_engine::demangling_style_doc -->
-        <var-decl name='demangling_style_doc' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-465'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-487'/>
     <!-- const demangler_engine -->
-    <qualified-type-def type-id='type-id-462' const='yes' id='type-id-459'/>
+    <qualified-type-def type-id='type-id-484' const='yes' id='type-id-481'/>
     <!-- const demangling_styles -->
-    <qualified-type-def type-id='type-id-464' const='yes' id='type-id-466'/>
+    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-488'/>
     <!-- char* __builtin_stpcpy(char*, const char*) -->
     <function-decl name='__builtin_stpcpy' mangled-name='stpcpy' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'char*' -->
@@ -11846,16 +12007,16 @@
     <!-- demangling_styles cplus_demangle_set_style(demangling_styles) -->
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
       <!-- parameter of type 'enum demangling_styles' -->
-      <parameter type-id='type-id-464' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <parameter type-id='type-id-486' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-464'/>
+      <return type-id='type-id-486'/>
     </function-decl>
     <!-- demangling_styles cplus_demangle_name_to_style(const char*) -->
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-464'/>
+      <return type-id='type-id-486'/>
     </function-decl>
     <!-- char* ada_demangle(const char*, int) -->
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
@@ -11878,9 +12039,9 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- demangling_styles current_demangling_style -->
-    <var-decl name='current_demangling_style' type-id='type-id-464' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <var-decl name='current_demangling_style' type-id='type-id-486' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
     <!-- const demangler_engine libiberty_demanglers[11] -->
-    <var-decl name='libiberty_demanglers' type-id='type-id-460' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <var-decl name='libiberty_demanglers' type-id='type-id-482' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <!-- char* cplus_demangle_v3(const char*, int) -->
     <function-decl name='cplus_demangle_v3' mangled-name='cplus_demangle_v3' filepath='../.././libiberty/../include/demangle.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_v3'>
       <!-- parameter of type 'const char*' -->
@@ -11981,11 +12142,11 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-467'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-489'/>
     <!-- size_t htab_size(htab_t) -->
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
       <!-- typedef size_t -->
       <return type-id='type-id-33'/>
     </function-decl>
@@ -11994,55 +12155,55 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-216' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-218' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-206'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <!-- htab_t htab_create_typed_alloc(size_t, htab_hash, htab_eq, htab_del, htab_alloc, htab_alloc, htab_free) -->
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-213' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-235' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-213' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-235' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-214' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-236' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-206'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <!-- void htab_set_functions_ex(htab_t, htab_hash, htab_eq, htab_del, void*, htab_alloc_with_arg, htab_free_with_arg) -->
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-216' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-218' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -12051,25 +12212,25 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-206'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <!-- void htab_empty(htab_t) -->
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void* htab_find(htab_t, void*) -->
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- void* -->
@@ -12078,29 +12239,29 @@
     <!-- void** htab_find_slot(htab_t, void*, insert_option) -->
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-219' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-241' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- void** -->
       <return type-id='type-id-101'/>
     </function-decl>
     <!-- void htab_remove_elt_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-204' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-226' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void htab_remove_elt(htab_t, void*) -->
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- void -->
@@ -12109,7 +12270,7 @@
     <!-- void htab_clear_slot(htab_t, void**) -->
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-101' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- void -->
@@ -12118,9 +12279,9 @@
     <!-- void htab_traverse_noresize(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-384' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-406' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- void -->
@@ -12129,9 +12290,9 @@
     <!-- double htab_collisions(htab_t) -->
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
       <!-- double -->
-      <return type-id='type-id-467'/>
+      <return type-id='type-id-489'/>
     </function-decl>
     <!-- hashval_t iterative_hash(void*, size_t, hashval_t) -->
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
@@ -12140,14 +12301,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-204' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <parameter type-id='type-id-226' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-204'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <!-- htab_hash htab_hash_pointer -->
-    <var-decl name='htab_hash_pointer' type-id='type-id-208' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
+    <var-decl name='htab_hash_pointer' type-id='type-id-230' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
     <!-- htab_eq htab_eq_pointer -->
-    <var-decl name='htab_eq_pointer' type-id='type-id-210' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-232' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void hex_init() -->
@@ -12156,7 +12317,7 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- const unsigned char _hex_value[256] -->
-    <var-decl name='_hex_value' type-id='type-id-393' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <var-decl name='_hex_value' type-id='type-id-415' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const char* unix_lbasename(const char*) -->
@@ -12192,35 +12353,35 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- md5_uint32[2] -->
-    <array-type-def dimensions='1' type-id='type-id-468' size-in-bits='64' id='type-id-469'>
+    <array-type-def dimensions='1' type-id='type-id-490' size-in-bits='64' id='type-id-491'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-7' id='type-id-470'/>
+      <subrange length='2' type-id='type-id-7' id='type-id-492'/>
     </array-type-def>
     <!-- struct md5_ctx -->
-    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-471'>
+    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-493'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- md5_uint32 md5_ctx::A -->
-        <var-decl name='A' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- md5_uint32 md5_ctx::B -->
-        <var-decl name='B' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- md5_uint32 md5_ctx::C -->
-        <var-decl name='C' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- md5_uint32 md5_ctx::D -->
-        <var-decl name='D' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- md5_uint32 md5_ctx::total[2] -->
-        <var-decl name='total' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-491' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- md5_uint32 md5_ctx::buflen -->
-        <var-decl name='buflen' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- char md5_ctx::buffer[128] -->
@@ -12228,26 +12389,26 @@
       </data-member>
     </class-decl>
     <!-- typedef uint32_t md5_uint32 -->
-    <typedef-decl name='md5_uint32' type-id='type-id-472' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-468'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-494' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-490'/>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-16' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-472'/>
+    <typedef-decl name='uint32_t' type-id='type-id-16' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-494'/>
     <!-- const md5_ctx -->
-    <qualified-type-def type-id='type-id-471' const='yes' id='type-id-473'/>
+    <qualified-type-def type-id='type-id-493' const='yes' id='type-id-495'/>
     <!-- const md5_ctx* -->
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-496'/>
     <!-- md5_ctx* -->
-    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-497'/>
     <!-- void md5_init_ctx(md5_ctx*) -->
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void* md5_read_ctx(const md5_ctx*, void*) -->
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
       <!-- parameter of type 'const md5_ctx*' -->
-      <parameter type-id='type-id-474' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- void* -->
@@ -12260,7 +12421,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
@@ -12271,14 +12432,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- void -->
       <return type-id='type-id-32'/>
     </function-decl>
     <!-- void* md5_finish_ctx(md5_ctx*, void*) -->
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-17' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- void* -->
@@ -12342,7 +12503,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- pid_t* pex_obj::children -->
-        <var-decl name='children' type-id='type-id-476' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int* pex_obj::status -->
@@ -12350,7 +12511,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- pex_time* pex_obj::time -->
-        <var-decl name='time' type-id='type-id-477' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int pex_obj::number_waited -->
@@ -12378,7 +12539,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- const pex_funcs* pex_obj::funcs -->
-        <var-decl name='funcs' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- void* pex_obj::sysdep -->
@@ -12386,11 +12547,11 @@
       </data-member>
     </class-decl>
     <!-- typedef __pid_t pid_t -->
-    <typedef-decl name='pid_t' type-id='type-id-479' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-480'/>
+    <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
     <!-- typedef int __pid_t -->
-    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-479'/>
+    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
     <!-- struct pex_time -->
-    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-481'>
+    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-156'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int pex_time::user_seconds -->
         <var-decl name='user_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
@@ -12409,66 +12570,66 @@
       </data-member>
     </class-decl>
     <!-- struct pex_funcs -->
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-482'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
-        <var-decl name='open_read' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
-        <var-decl name='open_write' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
-        <var-decl name='exec_child' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int (pex_obj*, int)* pex_funcs::close -->
-        <var-decl name='close' type-id='type-id-485' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
-        <var-decl name='wait' type-id='type-id-486' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
-        <var-decl name='pipe' type-id='type-id-487' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
-        <var-decl name='fdopenr' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
-        <var-decl name='fdopenw' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- void (pex_obj*)* pex_funcs::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
     <!-- FILE* (pex_obj*, int, int)* -->
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
     <!-- const pex_funcs -->
-    <qualified-type-def type-id='type-id-482' const='yes' id='type-id-491'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
     <!-- const pex_funcs* -->
-    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
     <!-- int (pex_obj*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
     <!-- int (pex_obj*, int)* -->
-    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
     <!-- int (pex_obj*, int*, int)* -->
-    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
     <!-- pex_time* -->
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
     <!-- pid_t* -->
-    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
     <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
     <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
     <!-- void (pex_obj*)* -->
-    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <!-- parameter of type 'int' -->
@@ -12478,7 +12639,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='tempbase' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <!-- parameter of type 'const pex_funcs*' -->
-      <parameter type-id='type-id-478' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
+      <parameter type-id='type-id-148' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
       <!-- pex_obj* -->
       <return type-id='type-id-131'/>
     </function-decl>
@@ -12539,12 +12700,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='count' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-477' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
+      <parameter type-id='type-id-147' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- FILE* (pex_obj*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-490'>
+    <function-type size-in-bits='64' id='type-id-173'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int' -->
@@ -12555,7 +12716,7 @@
       <return type-id='type-id-90'/>
     </function-type>
     <!-- int (pex_obj*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-492'>
+    <function-type size-in-bits='64' id='type-id-174'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'const char*' -->
@@ -12566,7 +12727,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- int (pex_obj*, int) -->
-    <function-type size-in-bits='64' id='type-id-493'>
+    <function-type size-in-bits='64' id='type-id-175'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int' -->
@@ -12575,7 +12736,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- int (pex_obj*, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-494'>
+    <function-type size-in-bits='64' id='type-id-176'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int*' -->
@@ -12586,7 +12747,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-495'>
+    <function-type size-in-bits='64' id='type-id-182'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int' -->
@@ -12606,33 +12767,33 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-314'/>
+      <parameter type-id='type-id-336'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-43'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-157'/>
     </function-type>
     <!-- pid_t (pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-496'>
+    <function-type size-in-bits='64' id='type-id-183'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'typedef pid_t' -->
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-157'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-43'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-477'/>
+      <parameter type-id='type-id-147'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-314'/>
+      <parameter type-id='type-id-336'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-43'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-157'/>
     </function-type>
     <!-- void (pex_obj*) -->
-    <function-type size-in-bits='64' id='type-id-497'>
+    <function-type size-in-bits='64' id='type-id-184'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- void -->
@@ -12779,7 +12940,7 @@
     <!-- wait* -->
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-500'/>
     <!-- const pex_funcs funcs -->
-    <var-decl name='funcs' type-id='type-id-491' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
+    <var-decl name='funcs' type-id='type-id-153' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <!-- int fcntl(int, int, ...) -->
     <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' -->
@@ -12800,7 +12961,7 @@
     <!-- __pid_t wait4(__pid_t, __WAIT_STATUS, int, rusage*) -->
     <function-decl name='wait4' filepath='/usr/include/sys/wait.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <!-- parameter of type 'typedef __WAIT_STATUS' -->
       <parameter type-id='type-id-499'/>
       <!-- parameter of type 'int' -->
@@ -12808,23 +12969,23 @@
       <!-- parameter of type 'rusage*' -->
       <parameter type-id='type-id-507'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- __pid_t waitpid(__pid_t, int*, int) -->
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-43'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- int kill(__pid_t, int) -->
     <function-decl name='kill' filepath='/usr/include/signal.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- int -->
@@ -12839,7 +13000,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-33'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-378'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <!-- void _exit(int) -->
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12858,7 +13019,7 @@
     <!-- __pid_t vfork() -->
     <function-decl name='vfork' filepath='/usr/include/unistd.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <!-- int dup2(int, int) -->
     <function-decl name='dup2' filepath='/usr/include/unistd.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12892,21 +13053,21 @@
     <!-- const unsigned short int[256] -->
     <array-type-def dimensions='1' type-id='type-id-508' size-in-bits='4096' id='type-id-509'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <!-- unsigned short int[256] -->
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='4096' id='type-id-510'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <!-- const unsigned short int -->
     <qualified-type-def type-id='type-id-30' const='yes' id='type-id-508'/>
     <!-- const unsigned short int _sch_istable[256] -->
     <var-decl name='_sch_istable' type-id='type-id-509' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
     <!-- const unsigned char _sch_toupper[256] -->
-    <var-decl name='_sch_toupper' type-id='type-id-393' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <var-decl name='_sch_toupper' type-id='type-id-415' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
     <!-- const unsigned char _sch_tolower[256] -->
-    <var-decl name='_sch_tolower' type-id='type-id-393' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <var-decl name='_sch_tolower' type-id='type-id-415' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- int __lxstat(int, const char*, stat*) -->
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index f0e5f9cd..3d9b3b9d 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -363,128 +363,473 @@
     </function-decl>
   </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'>
-    <class-decl name='DBusConnection' size-in-bits='2112' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-25'/>
-    <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='unsigned long int' size-in-bits='64' id='type-id-27'/>
-    <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='DBusBusType' type-id='type-id-29' filepath='../dbus/dbus-shared.h' line='61' column='1' id='type-id-30'/>
-    <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'/>
+    <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
+    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-42'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-43'/>
+    <typedef-decl name='DBusConnection' type-id='type-id-25' filepath='../dbus/dbus-connection.h' line='51' column='1' id='type-id-44'/>
+    <typedef-decl name='DBusBusType' type-id='type-id-45' filepath='../dbus/dbus-shared.h' line='61' column='1' id='type-id-46'/>
+    <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>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-47'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-48'/>
     <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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='1578' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='1528' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='1282' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='1200' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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 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 type-id='type-id-3' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-bus.c' line='1114' column='1'/>
       <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='1115' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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 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 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'/>
-      <return type-id='type-id-27'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
-      <return type-id='type-id-31'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <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 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 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'/>
-      <return type-id='type-id-31'/>
-    </function-decl>
+      <return type-id='type-id-47'/>
+    </function-decl>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-29'/>
+    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-34'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-33'/>
+    <typedef-decl name='DBusAtomic' type-id='type-id-59' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-26'/>
+    <typedef-decl name='DBusDataSlotList' type-id='type-id-60' filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-35'/>
+    <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-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-decl name='DBusFreeFunction' type-id='type-id-63' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
+    <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-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>
+    <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'>
+        <var-decl name='value' type-id='type-id-64' visibility='default' filepath='../dbus/dbus-sysdeps.h' line='232' column='1'/>
+      </data-member>
+    </class-decl>
+    <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'>
+        <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'>
+        <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-decl name='DBusCMutex' type-id='type-id-66' filepath='../dbus/dbus-threads-internal.h' line='45' column='1' id='type-id-49'/>
+    <typedef-decl name='DBusCondVar' type-id='type-id-67' filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-50'/>
+    <typedef-decl name='DBusCounter' type-id='type-id-68' filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-51'/>
+    <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-decl name='DBusMessage' type-id='type-id-70' filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-53'/>
+    <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-decl name='DBusRMutex' type-id='type-id-72' filepath='../dbus/dbus-threads-internal.h' line='39' column='1' id='type-id-55'/>
+    <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-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-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'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-63'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-65'/>
+    <class-decl name='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-66'/>
+    <class-decl name='DBusCondVar' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-67'/>
+    <class-decl name='DBusCounter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-68'/>
+    <class-decl name='DBusHashTable' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-69'/>
+    <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
+    <class-decl name='DBusObjectTree' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-71'/>
+    <class-decl name='DBusRMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-72'/>
+    <class-decl name='DBusTimeoutList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
+    <class-decl name='DBusTransport' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-74'/>
+    <class-decl name='DBusWatchList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-81' volatile='yes' id='type-id-64'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-80'/>
+    <typedef-decl name='DBusDataSlot' type-id='type-id-82' filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-78'/>
+    <typedef-decl name='DBusHeader' type-id='type-id-83' filepath='../dbus/dbus-marshal-header.h' line='30' column='1' id='type-id-79'/>
+    <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'/>
+    <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'>
+        <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'>
+        <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>
+    <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
+    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='320' id='type-id-84'>
+      <subrange length='10' type-id='type-id-43' id='type-id-86'/>
+    </array-type-def>
+    <typedef-decl name='DBusHeaderField' type-id='type-id-87' filepath='../dbus/dbus-marshal-header.h' line='31' column='1' id='type-id-85'/>
+    <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'>
+        <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'>
-    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='320' id='type-id-34'>
-      <subrange length='10' type-id='type-id-27' id='type-id-35'/>
+    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='320' id='type-id-84'>
+      <subrange length='10' type-id='type-id-43' id='type-id-86'/>
     </array-type-def>
-    <class-decl name='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
-    <class-decl name='DBusCondVar' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
-    <class-decl name='DBusCounter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-38'/>
-    <class-decl name='DBusHashTable' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-39'/>
-    <class-decl name='DBusObjectTree' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-40'/>
-    <class-decl name='DBusPendingCall' size-in-bits='576' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-41'/>
-    <class-decl name='DBusRMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-42'/>
-    <class-decl name='DBusTimeout' size-in-bits='448' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-43'/>
-    <class-decl name='DBusTimeoutList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-44'/>
-    <class-decl name='DBusTransport' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-45'/>
-    <class-decl name='DBusWatch' size-in-bits='512' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-46'/>
-    <class-decl name='DBusWatchList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-47'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-48'/>
-    <typedef-decl name='DBusAtomic' type-id='type-id-49' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-50'/>
-    <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='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-66'/>
+    <class-decl name='DBusCondVar' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-67'/>
+    <class-decl name='DBusCounter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-68'/>
+    <class-decl name='DBusHashTable' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-69'/>
+    <class-decl name='DBusObjectTree' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-71'/>
+    <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'>
-        <var-decl name='value' type-id='type-id-51' visibility='default' filepath='../dbus/dbus-sysdeps.h' line='232' 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-pending-call.c' line='64' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
-    <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='DBusRMutex' type-id='type-id-42' filepath='../dbus/dbus-threads-internal.h' line='39' column='1' id='type-id-53'/>
-    <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='DBusCondVar' type-id='type-id-37' filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-55'/>
-    <typedef-decl name='DBusMessage' type-id='type-id-56' filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-57'/>
-    <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='DBusRMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-72'/>
+    <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'>
-        <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-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'>
+        <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'>
-        <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='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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
+    <class-decl name='DBusTimeoutList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
+    <class-decl name='DBusTransport' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-74'/>
+    <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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'>
+        <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>
+    <class-decl name='DBusWatchList' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-75'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-80'/>
+    <typedef-decl name='DBusAtomic' type-id='type-id-59' filepath='../dbus/dbus-sysdeps.h' line='222' column='1' id='type-id-26'/>
+    <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'>
+        <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-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-decl name='DBusRMutex' type-id='type-id-72' filepath='../dbus/dbus-threads-internal.h' line='39' column='1' id='type-id-55'/>
+    <typedef-decl name='DBusCMutex' type-id='type-id-66' filepath='../dbus/dbus-threads-internal.h' line='45' column='1' id='type-id-49'/>
+    <typedef-decl name='DBusCondVar' type-id='type-id-67' filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-50'/>
+    <typedef-decl name='DBusMessage' type-id='type-id-70' filepath='../dbus/dbus-message.h' line='44' column='1' id='type-id-53'/>
+    <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'>
+        <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'>
+        <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'>
         <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'/>
@@ -499,13 +844,13 @@
         <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'>
-        <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'>
         <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'>
-        <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'>
         <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'/>
@@ -520,16 +865,16 @@
         <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'>
-        <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-decl name='DBusHeader' type-id='type-id-60' filepath='../dbus/dbus-marshal-header.h' line='30' column='1' id='type-id-58'/>
-    <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'>
+    <typedef-decl name='DBusHeader' type-id='type-id-83' filepath='../dbus/dbus-marshal-header.h' line='30' column='1' id='type-id-79'/>
+    <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'>
         <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'>
-        <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'>
         <var-decl name='padding' type-id='type-id-16' visibility='default' filepath='../dbus/dbus-marshal-header.h' line='58' column='1'/>
@@ -538,91 +883,91 @@
         <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>
-    <typedef-decl name='DBusHeaderField' type-id='type-id-61' filepath='../dbus/dbus-marshal-header.h' line='31' column='1' id='type-id-33'/>
-    <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'>
+    <typedef-decl name='DBusHeaderField' type-id='type-id-87' filepath='../dbus/dbus-marshal-header.h' line='31' column='1' id='type-id-85'/>
+    <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'>
         <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-decl name='DBusDataSlotList' type-id='type-id-62' filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-59'/>
-    <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'>
+    <typedef-decl name='DBusDataSlotList' type-id='type-id-60' filepath='../dbus/dbus-dataslot.h' line='31' column='1' id='type-id-35'/>
+    <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'>
-        <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'>
         <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-decl name='DBusDataSlot' type-id='type-id-64' filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-65'/>
-    <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'>
+    <typedef-decl name='DBusDataSlot' type-id='type-id-82' filepath='../dbus/dbus-dataslot.h' line='34' column='1' id='type-id-78'/>
+    <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'>
         <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'>
-        <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-decl name='DBusFreeFunction' type-id='type-id-67' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-66'/>
-    <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='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='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='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='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='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='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='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'/>
-    <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'/>
+    <typedef-decl name='DBusFreeFunction' type-id='type-id-63' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
+    <typedef-decl name='DBusCounter' type-id='type-id-68' filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-51'/>
+    <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-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-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-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-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-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-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-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-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='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'/>
-    <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'>
+    <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-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'/>
+    <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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-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='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='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'/>
-    <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'/>
+    <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-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-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-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-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='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='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='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='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='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='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='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='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='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='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='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'/>
-    <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'>
+    <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-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-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-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-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-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-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-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-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-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-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-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'/>
+    <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'>
-        <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'>
         <var-decl name='queue_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='243' column='1'/>
@@ -631,444 +976,450 @@
         <var-decl name='counter_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='244' column='1'/>
       </data-member>
     </class-decl>
-    <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'/>
-    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-63'/>
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-118'/>
-    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-122'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-29'/>
+    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-31'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-65'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-41'/>
     <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
-    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
-    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-126'/>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-88'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-90'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-92'/>
-    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-74'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-95'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-101'/>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-67'/>
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-138'/>
-    <qualified-type-def type-id='type-id-52' volatile='yes' id='type-id-51'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-124'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-125'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-34'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-126'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-33'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-128'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-137'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-63'/>
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-141'/>
+    <qualified-type-def type-id='type-id-81' volatile='yes' id='type-id-64'/>
     <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 type-id='type-id-17' name='will_modify_sigpipe' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6043' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-81' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6018' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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-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-47' 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-81' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5970' column='1'/>
-      <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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-31'/>
+      <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'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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-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-47' 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-80' name='n' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6195' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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-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-47' 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-80' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6153' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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-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-47' 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-80' name='n' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6097' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-48'/>
+      <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'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <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 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-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-47' 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-80' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6058' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5746' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5676' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-103' 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-10' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5565' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-103' 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-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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-105' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5406' column='1'/>
-      <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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-107' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5307' column='1'/>
-      <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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-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-47' 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-141' 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-131' name='data_size' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5261' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-137' name='pid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5227' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-137' name='uid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5191' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-39' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5075' column='1'/>
-      <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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-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-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-47' 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-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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-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-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-47' 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-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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-115'/>
+      <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'/>
+      <return type-id='type-id-125'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-125' name='preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3192' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-77'/>
+      <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'/>
+      <return type-id='type-id-40'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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-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-47' 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-30' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3936' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-47' 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-30' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3902' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-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-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-47' 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-125' 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-30' 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-48' name='client_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3220' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-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-47' 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-30' 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-48' name='serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3304' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='dbus_connection_open_private' mangled-name='dbus_connection_open_private' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='2659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_open_private'>
       <parameter type-id='type-id-15' name='address' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='2659' column='1'/>
       <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'/>
-      <return type-id='type-id-31'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-15' name='address' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='2616' column='1'/>
       <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'/>
-      <return type-id='type-id-31'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <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 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-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-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-47' 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-30' 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-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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-47' 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-30' 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-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 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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-77'/>
+      <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'/>
+      <return type-id='type-id-40'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-127'>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-111'/>
+    <function-type size-in-bits='64' id='type-id-132'>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-10'/>
-      <return type-id='type-id-86'/>
+      <return type-id='type-id-102'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-128'>
-      <parameter type-id='type-id-31'/>
+    <function-type size-in-bits='64' id='type-id-133'>
+      <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-27'/>
+    <function-type size-in-bits='64' id='type-id-134'>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-130'>
-      <parameter type-id='type-id-117'/>
+    <function-type size-in-bits='64' id='type-id-135'>
+      <parameter type-id='type-id-90'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-131'>
-      <parameter type-id='type-id-120'/>
+    <function-type size-in-bits='64' id='type-id-136'>
+      <parameter type-id='type-id-126'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-133'>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-77'/>
+    <function-type size-in-bits='64' id='type-id-76'>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-40'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-134'>
-      <parameter type-id='type-id-31'/>
+    <function-type size-in-bits='64' id='type-id-138'>
+      <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-135'>
-      <parameter type-id='type-id-117'/>
+    <function-type size-in-bits='64' id='type-id-139'>
+      <parameter type-id='type-id-90'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-136'>
-      <parameter type-id='type-id-120'/>
+    <function-type size-in-bits='64' id='type-id-140'>
+      <parameter type-id='type-id-126'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-137'>
+    <function-type size-in-bits='64' id='type-id-77'>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
+    <typedef-decl name='DBusPendingCallNotifyFunction' type-id='type-id-142' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-89'/>
+    <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-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'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-143'/>
+    <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'>
-    <type-decl name='variadic parameter type' id='type-id-139'/>
-    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-140'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
+    <type-decl name='variadic parameter type' id='type-id-148'/>
+    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-150'/>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='dbus_error_init' mangled-name='dbus_error_init' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_error_init'>
@@ -1098,13 +1449,13 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
   </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-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'/>
     <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 type-id='type-id-10' name='memory' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1'/>
       <return type-id='type-id-4'/>
@@ -1113,25 +1464,25 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='dbus_realloc' mangled-name='dbus_realloc' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_realloc'>
       <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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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'/>
       <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'>
-    <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'>
         <var-decl name='gp_offset' type-id='type-id-3' visibility='default'/>
       </data-member>
@@ -1145,8 +1496,8 @@
         <var-decl name='reg_save_area' type-id='type-id-10' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='DBusMessageIter' type-id='type-id-144' filepath='../dbus/dbus-message.h' line='46' column='1' id='type-id-145'/>
-    <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'>
+    <typedef-decl name='DBusMessageIter' type-id='type-id-153' filepath='../dbus/dbus-message.h' line='46' column='1' id='type-id-154'/>
+    <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'>
         <var-decl name='dummy1' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-message.h' line='53' column='1'/>
       </data-member>
@@ -1190,12 +1541,12 @@
         <var-decl name='pad3' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-message.h' line='66' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-147'/>
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-148'/>
-    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-156'/>
+    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-158'/>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='dbus_message_type_to_string' mangled-name='dbus_message_type_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4691' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_type_to_string'>
@@ -1212,323 +1563,323 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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-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-30' 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-81' name='slot' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4636' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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-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-30' 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-81' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4601' column='1'/>
-      <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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-30' 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-128' name='path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3165' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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='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='sub' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2952' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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='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='sub' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2919' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-10' name='value' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2793' column='1'/>
       <parameter type-id='type-id-2' name='n_elements' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2794' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-10' name='value' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2658' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-30' 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-155' name='iter' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2422' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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 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 type-id='type-id-24' name='n_elements' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2393' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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 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-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='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='sub' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2196' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-30' 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-155' name='iter' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='2065' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-15' name='signal_name' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3632' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 type-id='type-id-15' name='method' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3604' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='dbus_message_demarshal' mangled-name='dbus_message_demarshal' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_demarshal'>
       <parameter type-id='type-id-15' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4783' column='1'/>
       <parameter type-id='type-id-2' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4784' column='1'/>
       <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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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'>
       <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='1424' column='1'/>
       <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='1425' column='1'/>
       <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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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'>
       <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='1333' column='1'/>
       <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='1334' column='1'/>
       <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='1335' column='1'/>
       <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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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 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 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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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 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 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'/>
-      <return type-id='type-id-111'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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='1982' column='1'/>
       <parameter is-variadic='yes'/>
@@ -1536,21 +1887,21 @@
     </function-decl>
     <function-decl name='dbus_set_error_from_message' mangled-name='dbus_set_error_from_message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_set_error_from_message'>
       <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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-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-30' 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-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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -1567,93 +1918,93 @@
     </function-decl>
   </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-decl name='DBusPendingCallNotifyFunction' type-id='type-id-150' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-151'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
+    <typedef-decl name='DBusPendingCallNotifyFunction' type-id='type-id-142' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-89'/>
+    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-142'/>
     <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 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-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-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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-111'/>
+      <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'/>
+      <return type-id='type-id-30'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-113'/>
+      <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'/>
+      <return type-id='type-id-123'/>
     </function-decl>
     <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 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-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-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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-152'>
-      <parameter type-id='type-id-113'/>
+    <function-type size-in-bits='64' id='type-id-147'>
+      <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
   </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'>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-153'>
-      <subrange length='16' type-id='type-id-27' id='type-id-154'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-159'>
+      <subrange length='16' type-id='type-id-43' id='type-id-160'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-155'>
-      <subrange length='4' type-id='type-id-27' id='type-id-156'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-161'>
+      <subrange length='4' type-id='type-id-43' id='type-id-162'/>
     </array-type-def>
-    <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
         <var-decl name='guid_hex' type-id='type-id-7' visibility='default' filepath='../dbus/dbus-server-protected.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <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'>
-        <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'>
         <var-decl name='address' type-id='type-id-22' visibility='default' filepath='../dbus/dbus-server-protected.h' line='69' column='1'/>
@@ -1665,19 +2016,19 @@
         <var-decl name='max_connections' type-id='type-id-2' visibility='default' filepath='../dbus/dbus-server-protected.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <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'>
-        <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'>
         <var-decl name='new_connection_data' type-id='type-id-10' visibility='default' filepath='../dbus/dbus-server-protected.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <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'>
-        <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'>
         <var-decl name='disconnected' type-id='type-id-3' visibility='default' filepath='../dbus/dbus-server-protected.h' line='87' column='1'/>
@@ -1686,125 +2037,125 @@
         <var-decl name='have_server_lock' type-id='type-id-3' visibility='default' filepath='../dbus/dbus-server-protected.h' line='90' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='DBusServerVTable' type-id='type-id-161' filepath='../dbus/dbus-server-protected.h' line='38' column='1' id='type-id-162'/>
-    <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'>
+    <typedef-decl name='DBusServerVTable' type-id='type-id-167' filepath='../dbus/dbus-server-protected.h' line='38' column='1' id='type-id-168'/>
+    <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'>
-        <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'>
-        <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-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='DBusGUID' type-id='type-id-165' filepath='../dbus/dbus-sysdeps.h' line='507' column='1' id='type-id-159'/>
-    <union-decl name='DBusGUID' size-in-bits='128' visibility='default' filepath='../dbus/dbus-internals.h' line='351' column='1' id='type-id-165'>
+    <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-decl name='DBusGUID' type-id='type-id-171' filepath='../dbus/dbus-sysdeps.h' line='507' 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'>
-        <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'>
-        <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-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'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-167'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-166'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-173'/>
+    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-172'/>
     <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 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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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-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-173' 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-166' 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-10' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='891' column='1'/>
-      <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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-173' 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-175' name='mechanisms' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1034' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-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-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-173' 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-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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-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-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-173' 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-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 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 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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
-      <return type-id='type-id-167'/>
+      <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'/>
+      <return type-id='type-id-173'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='dbus_server_listen' mangled-name='dbus_server_listen' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_listen'>
       <parameter type-id='type-id-15' name='address' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='549' column='1'/>
       <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'/>
-      <return type-id='type-id-167'/>
+      <return type-id='type-id-173'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-170'>
-      <parameter type-id='type-id-167'/>
+    <function-type size-in-bits='64' id='type-id-176'>
+      <parameter type-id='type-id-173'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-171'>
-      <parameter type-id='type-id-167'/>
-      <parameter type-id='type-id-31'/>
+    <function-type size-in-bits='64' id='type-id-177'>
+      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
   </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-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'/>
-    <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'>
+    <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'/>
+    <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'>
         <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'/>
       </data-member>
@@ -1821,11 +2172,11 @@
         <var-decl name='dummy17' type-id='type-id-2' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='50' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-174'/>
-    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-180'/>
+    <qualified-type-def type-id='type-id-179' const='yes' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-182'/>
     <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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -1851,11 +2202,11 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='dbus_signature_validate_single' mangled-name='dbus_signature_validate_single' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_signature_validate_single'>
@@ -1864,16 +2215,16 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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-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-182' 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-180' name='subiter' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.c' line='208' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
@@ -1917,216 +2268,216 @@
     </function-decl>
   </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'>
-    <class-decl name='DBusMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-177'/>
-    <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'/>
-    <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='DBusMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-183'/>
+    <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'/>
+    <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'>
         <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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'>
-        <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-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='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='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='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='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='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='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='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='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='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='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='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='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='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='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'/>
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-199'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-204'/>
-    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-195'/>
-    <qualified-type-def type-id='type-id-179' const='yes' id='type-id-206'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-194'/>
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-197'/>
+    <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-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-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-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-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-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-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-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-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-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-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-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-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-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-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'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-210'/>
+    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-201'/>
+    <qualified-type-def type-id='type-id-185' const='yes' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-203'/>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='dbus_threads_init_default' mangled-name='dbus_threads_init_default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.c' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_threads_init_default'>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-203'>
-      <return type-id='type-id-108'/>
+    <function-type size-in-bits='64' id='type-id-209'>
+      <return type-id='type-id-29'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-205'>
-      <return type-id='type-id-204'/>
+    <function-type size-in-bits='64' id='type-id-211'>
+      <return type-id='type-id-210'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-208'>
-      <parameter type-id='type-id-108'/>
-      <parameter type-id='type-id-204'/>
+    <function-type size-in-bits='64' id='type-id-214'>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-210'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-209'>
-      <parameter type-id='type-id-204'/>
+    <function-type size-in-bits='64' id='type-id-215'>
+      <parameter type-id='type-id-210'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-210'>
+    <function-type size-in-bits='64' id='type-id-216'>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-211'>
-      <parameter type-id='type-id-108'/>
+    <function-type size-in-bits='64' id='type-id-217'>
+      <parameter type-id='type-id-29'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-212'>
-      <parameter type-id='type-id-108'/>
-      <parameter type-id='type-id-204'/>
+    <function-type size-in-bits='64' id='type-id-218'>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-210'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-213'>
-      <parameter type-id='type-id-204'/>
+    <function-type size-in-bits='64' id='type-id-219'>
+      <parameter type-id='type-id-210'/>
       <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-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'/>
-    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-214'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-143'/>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-216'>
+    <function-type size-in-bits='64' id='type-id-146'>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-uuidgen.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='dbus_internal_do_not_use_get_uuid' mangled-name='dbus_internal_do_not_use_get_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_get_uuid'>
       <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 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 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 type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='86' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
   </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-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'/>
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-217'/>
+    <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'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-144'/>
     <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 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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <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 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 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 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'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-219'>
-      <parameter type-id='type-id-120'/>
+    <function-type size-in-bits='64' id='type-id-145'>
+      <parameter type-id='type-id-126'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-17'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index b4420eb1..5ad8a590 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1540,83 +1540,90 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
   </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'>
-    <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_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_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'>
+        <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'>
+        <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>
+    <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'>
         <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'>
-        <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'>
         <var-decl name='lock' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <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'>
         <var-decl name='fileline_data' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='140' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <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'>
         <var-decl name='syminfo_data' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <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'>
-        <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'>
-        <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-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='syminfo' type-id='type-id-13' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='121' column='1' id='type-id-10'/>
-    <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'>
+    <typedef-decl name='fileline' type-id='type-id-13' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='114' column='1' id='type-id-11'/>
+    <typedef-decl name='syminfo' type-id='type-id-14' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='121' column='1' id='type-id-12'/>
+    <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'>
         <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'>
-        <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'>
-        <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-decl name='__compar_fn_t' type-id='type-id-16' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-17'/>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-11'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-18'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-19'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-19'/>
     <qualified-type-def type-id='type-id-20' const='yes' id='type-id-21'/>
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-22'/>
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-23'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-12'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-23'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-14'/>
     <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 type-id='type-id-18' name='state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2958' column='1'/>
       <parameter type-id='type-id-26' name='base_address' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2959' column='1'/>
       <parameter type-id='type-id-22' name='dwarf_info' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2960' column='1'/>
-      <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 type-id='type-id-22' name='dwarf_line' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2962' column='1'/>
-      <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 type-id='type-id-22' name='dwarf_abbrev' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2964' column='1'/>
-      <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 type-id='type-id-22' name='dwarf_ranges' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2966' column='1'/>
-      <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 type-id='type-id-22' name='dwarf_str' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2968' column='1'/>
-      <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='is_bigendian' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2970' column='1'/>
+      <parameter type-id='type-id-8' name='dwarf_str_size' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2969' column='1'/>
+      <parameter type-id='type-id-10' name='is_bigendian' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2970' column='1'/>
       <parameter type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2971' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2972' column='1'/>
       <parameter type-id='type-id-23' name='fileline_fn' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' line='2972' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-18'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-19'/>
@@ -1624,54 +1631,54 @@
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-2'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-18'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__asan_internal_memset' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-15'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__asan_internal_strnlen' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='__asan_internal_strcmp' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-18'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__asan_backtrace_qsort' mangled-name='__asan_backtrace_qsort' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_qsort'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -1680,7 +1687,7 @@
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-28'/>
     <function-type size-in-bits='64' id='type-id-24'>
@@ -1689,7 +1696,7 @@
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-25'>
       <parameter type-id='type-id-18'/>
@@ -1699,10 +1706,10 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-16'/>
     <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-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-decl name='uintptr_t' type-id='type-id-33' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-26'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-20'/>
     <typedef-decl name='backtrace_full_callback' type-id='type-id-34' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='110' column='1' id='type-id-29'/>
@@ -1715,9 +1722,9 @@
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-38'>
       <parameter type-id='type-id-1'/>
@@ -1732,14 +1739,14 @@
     <function-decl name='dl_iterate_phdr' filepath='/usr/include/link.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-39'/>
     <function-type size-in-bits='64' id='type-id-40'>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-1'/>
-      <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'>
@@ -1749,7 +1756,7 @@
       <parameter type-id='type-id-29' name='callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='167' column='1'/>
       <parameter type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='168' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='168' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-18' name='state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='182' column='1'/>
@@ -1757,24 +1764,24 @@
       <parameter type-id='type-id-30' name='callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='183' column='1'/>
       <parameter type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='184' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='184' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-42'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-18'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-23'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
-    <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'>
     <function-decl name='__asan_backtrace_vector_finish' mangled-name='__asan_backtrace_vector_finish' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='258' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_vector_finish'>
@@ -1796,19 +1803,19 @@
         <var-decl name='base' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <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>
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
     <function-decl name='__asan_backtrace_get_view' mangled-name='__asan_backtrace_get_view' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_get_view'>
       <parameter type-id='type-id-18' name='state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='53' column='1'/>
-      <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 type-id='type-id-44' name='offset' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='54' column='1'/>
-      <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 type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='55' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='56' column='1'/>
       <parameter type-id='type-id-47' name='view' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='56' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-18' name='state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' line='87' column='1'/>
@@ -1818,55 +1825,55 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='getpagesize' filepath='/usr/include/unistd.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='mmap' filepath='/usr/include/sys/mman.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='munmap' filepath='/usr/include/sys/mman.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <type-decl name='long int' size-in-bits='64' id='type-id-45'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.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'>
     <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 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 type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='92' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='open' filepath='/usr/include/fcntl.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__errno_location' filepath='/usr/include/bits/errno.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-42'/>
     </function-decl>
     <function-decl name='close' filepath='/usr/include/unistd.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <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'>
     <function-decl name='__asan_backtrace_create_state' mangled-name='__asan_backtrace_create_state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_create_state'>
       <parameter type-id='type-id-2' name='filename' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' line='46' column='1'/>
-      <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 type-id='type-id-27' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' line='47' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' line='48' column='1'/>
       <return type-id='type-id-18'/>
@@ -2015,7 +2022,7 @@
         <var-decl name='s' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='470' column='1' id='type-id-64'>
@@ -2031,15 +2038,15 @@
         <var-decl name='name' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <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'>
-        <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>
     <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'>
-        <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'>
         <var-decl name='name' type-id='type-id-76' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='482' column='1'/>
@@ -2098,13 +2105,13 @@
         <var-decl name='name' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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'>
         <var-decl name='java_name' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <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'>
         <var-decl name='print' type-id='type-id-81' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='88' column='1'/>
@@ -2128,7 +2135,7 @@
         <var-decl name='string' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='525' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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>
     <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='531' column='1' id='type-id-71'>
@@ -2138,7 +2145,7 @@
     </class-decl>
     <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'>
-        <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>
     <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='544' column='1' id='type-id-73'>
@@ -2154,7 +2161,7 @@
         <var-decl name='sub' type-id='type-id-76' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='555' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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>
     <class-decl name='d_info' size-in-bits='768' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='93' column='1' id='type-id-82'>
@@ -2165,7 +2172,7 @@
         <var-decl name='send' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <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'>
         <var-decl name='n' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='102' column='1'/>
@@ -2174,34 +2181,34 @@
         <var-decl name='comps' type-id='type-id-76' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <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'>
-        <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'>
         <var-decl name='subs' type-id='type-id-83' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <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'>
-        <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'>
-        <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'>
         <var-decl name='last_name' type-id='type-id-76' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <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'>
-        <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'>
-        <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>
     <qualified-type-def type-id='type-id-55' const='yes' id='type-id-48'/>
@@ -2216,26 +2223,26 @@
     <function-decl name='__asan_cplus_demangle_fill_name' mangled-name='__asan_cplus_demangle_fill_name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_fill_name'>
       <parameter type-id='type-id-76' name='p' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='783' column='1'/>
       <parameter type-id='type-id-2' name='s' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='783' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='783' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='783' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-76' name='p' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='797' column='1'/>
-      <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 type-id='type-id-76' name='name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='798' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-76' name='p' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='812' column='1'/>
       <parameter type-id='type-id-78' name='kind' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='813' column='1'/>
       <parameter type-id='type-id-76' name='name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='814' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-76' name='p' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='831' column='1'/>
       <parameter type-id='type-id-79' name='kind' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='832' column='1'/>
       <parameter type-id='type-id-76' name='name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='833' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-86' name='di' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='2230' column='1'/>
@@ -2243,41 +2250,41 @@
     </function-decl>
     <function-decl name='__asan_cplus_demangle_mangled_name' mangled-name='__asan_cplus_demangle_mangled_name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_mangled_name'>
       <parameter type-id='type-id-86' name='di' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1140' column='1'/>
-      <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'/>
       <return type-id='type-id-76'/>
     </function-decl>
     <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 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 type-id='type-id-85' name='dc' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4030' column='1'/>
       <parameter type-id='type-id-87' name='callback' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4031' column='1'/>
       <parameter type-id='type-id-1' name='opaque' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4031' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 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 type-id='type-id-85' name='dc' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4069' column='1'/>
-      <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 type-id='type-id-88' name='palc' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='4070' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__asan_cplus_demangle_init_info' mangled-name='__asan_cplus_demangle_init_info' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='5731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_init_info'>
       <parameter type-id='type-id-2' name='mangled' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='5731' column='1'/>
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='5731' column='1'/>
-      <parameter type-id='type-id-15' name='len' 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 type-id='type-id-8' name='len' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='5731' column='1'/>
       <parameter type-id='type-id-86' name='di' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='5732' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__asan_cplus_demangle_v3' mangled-name='__asan_cplus_demangle_v3' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6018' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_v3'>
       <parameter type-id='type-id-2' name='mangled' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6018' column='1'/>
-      <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'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__asan_cplus_demangle_v3_callback' mangled-name='__asan_cplus_demangle_v3_callback' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_cplus_demangle_v3_callback'>
       <parameter type-id='type-id-2' name='mangled' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6026' column='1'/>
-      <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 type-id='type-id-87' name='callback' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6027' column='1'/>
       <parameter type-id='type-id-1' name='opaque' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6027' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-2' name='mangled' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6039' column='1'/>
@@ -2287,7 +2294,7 @@
       <parameter type-id='type-id-2' name='mangled' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6047' column='1'/>
       <parameter type-id='type-id-87' name='callback' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6048' column='1'/>
       <parameter type-id='type-id-1' name='opaque' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6048' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='6137' column='1'/>
@@ -2305,45 +2312,45 @@
     </function-decl>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__asan_internal_memcpy' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__asan_internal_strlen' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-15'/>
+      <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='sprintf' filepath='/usr/include/stdio.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-2'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__asan_internal_strncmp' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__asan_internal_memcmp' filepath='../../.././libsanitizer/libbacktrace/backtrace-rename.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <type-decl name='short int' size-in-bits='16' id='type-id-77'/>
-    <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'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-50'/>
     <typedef-decl name='demangle_callbackref' type-id='type-id-89' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-87'/>
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-89'/>
     <function-type size-in-bits='64' id='type-id-90'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
     </function-type>
@@ -2658,8 +2665,8 @@
       <function-decl name='PrintSourceLocation' mangled-name='_ZN11__sanitizer19PrintSourceLocationEPNS_20InternalScopedStringEPKcii' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-106'/>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='PrintModuleAndOffset' mangled-name='_ZN11__sanitizer20PrintModuleAndOffsetEPNS_20InternalScopedStringEPKcm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2727,7 +2734,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -2776,11 +2783,11 @@
     <function-type size-in-bits='64' id='type-id-113'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-124'/>
     </function-type>
     <namespace-decl name='__sanitizer'>
-      <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>
     <reference-type-def kind='lvalue' type-id='type-id-33' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-119'/>
@@ -2803,7 +2810,7 @@
       </function-decl>
       <function-decl name='internal_isatty' mangled-name='_ZN11__sanitizer15internal_isattyEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-132'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
@@ -2842,7 +2849,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-140' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -2945,7 +2952,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-142' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3060,14 +3067,14 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libc.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-decl name='__sanitizer'>
       <function-decl name='IsSpace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-124'/>
       </function-decl>
       <function-decl name='internal_memcmp' mangled-name='_ZN11__sanitizer15internal_memcmpEPKvS1_m' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1' name='s1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
         <parameter type-id='type-id-1' name='s2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
         <parameter type-id='type-id-99' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='RoundDownTo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-99'/>
@@ -3075,7 +3082,7 @@
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='IsDigit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-124'/>
       </function-decl>
       <function-decl name='Min&lt;long long unsigned int&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3085,7 +3092,7 @@
       </function-decl>
       <function-decl name='internal_memchr' mangled-name='_ZN11__sanitizer15internal_memchrEPKvim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-99'/>
         <return type-id='type-id-1'/>
       </function-decl>
@@ -3102,7 +3109,7 @@
       </function-decl>
       <function-decl name='internal_strchrnul' mangled-name='_ZN11__sanitizer18internal_strchrnulEPKci' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-28'/>
       </function-decl>
       <function-decl name='internal_strncat' mangled-name='_ZN11__sanitizer16internal_strncatEPcPKcm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3114,7 +3121,7 @@
       <function-decl name='internal_simple_strtoll' mangled-name='_ZN11__sanitizer23internal_simple_strtollEPKcPPci' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-130'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-157'/>
       </function-decl>
       <function-decl name='mem_is_zero' mangled-name='_ZN11__sanitizer11mem_is_zeroEPKcm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3140,10 +3147,10 @@
         <var-decl name='ss_sp' type-id='type-id-1' visibility='default' filepath='/usr/include/bits/sigstack.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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'>
-        <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>
     <class-decl name='link_map' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/link.h' line='85' column='1' id='type-id-161'>
@@ -3307,7 +3314,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~MemoryMappingLayout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-172' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3331,7 +3338,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~MemoryMappingLayout' mangled-name='_ZN11__sanitizer19MemoryMappingLayoutD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-172' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3356,10 +3363,10 @@
       </class-decl>
       <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'>
-          <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'>
-          <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'>
           <var-decl name='buffer_' type-id='type-id-127' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='61' column='1'/>
@@ -3371,26 +3378,26 @@
           <var-decl name='entry_' type-id='type-id-178' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='63' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='320'>
-          <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'>
           <function-decl name='ThreadLister' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-174' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadLister' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-174' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='GetNextTID' mangled-name='_ZN11__sanitizer12ThreadLister10GetNextTIDEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-174' is-artificial='yes'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -3414,21 +3421,21 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadLister' mangled-name='_ZN11__sanitizer12ThreadListerC2Ei' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-174' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadLister' mangled-name='_ZN11__sanitizer12ThreadListerD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-174' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='internal_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-196'/>
         <return type-id='type-id-99'/>
       </function-decl>
@@ -3451,7 +3458,7 @@
       <function-decl name='internal_lseek' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-132'/>
         <parameter type-id='type-id-197'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_readlink' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3462,7 +3469,7 @@
       </function-decl>
       <function-decl name='internal_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_getdents' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='590' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3474,9 +3481,9 @@
       <function-decl name='internal_mmap' mangled-name='_ZN11__sanitizer13internal_mmapEPvmiiiy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-198'/>
         <return type-id='type-id-99'/>
       </function-decl>
@@ -3512,23 +3519,23 @@
         <return type-id='type-id-200'/>
       </function-decl>
       <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 type-id='type-id-8' name='request' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
-        <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='request' 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 type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
         <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-42'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_getppid' mangled-name='_ZN11__sanitizer16internal_getppidEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-99'/>
       </function-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
@@ -3541,14 +3548,14 @@
         <return type-id='type-id-99'/>
       </function-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-182'/>
         <parameter type-id='type-id-176'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_sigdelset' mangled-name='_ZN11__sanitizer18internal_sigdelsetEPNS_27__sanitizer_kernel_sigset_tEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-202'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='ReadBinaryName' mangled-name='_ZN11__sanitizer14ReadBinaryNameEPcm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3572,7 +3579,7 @@
       <function-decl name='internal_clone' mangled-name='_ZN11__sanitizer14internal_cloneEPFiPvES0_iS0_PiS0_S3_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-203'/>
         <parameter type-id='type-id-1'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-1'/>
         <parameter type-id='type-id-42'/>
         <parameter type-id='type-id-1'/>
@@ -3636,7 +3643,7 @@
       </enum-decl>
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-186'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
@@ -3739,7 +3746,7 @@
     <qualified-type-def type-id='type-id-223' const='yes' id='type-id-228'/>
     <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-230'/>
-    <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-decl name='__sanitizer'>
       <typedef-decl name='string_predicate_t' type-id='type-id-227' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='467' column='1' id='type-id-231'/>
       <function-decl name='Unwind_GetIP' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3774,7 +3781,7 @@
       </function-decl>
       <function-decl name='SanitizerGetThreadName' mangled-name='_ZN11__sanitizer22SanitizerGetThreadNameEPci' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-124'/>
       </function-decl>
       <function-decl name='InitTlsSize' mangled-name='_ZN11__sanitizer11InitTlsSizeEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3801,7 +3808,7 @@
       <parameter type-id='type-id-229'/>
       <parameter type-id='type-id-232'/>
       <parameter type-id='type-id-88'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='dlsym' filepath='/usr/include/dlfcn.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
@@ -3809,20 +3816,20 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='prctl' filepath='/usr/include/sys/prctl.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='confstr' filepath='/usr/include/unistd.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-15'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='pthread_attr_setstacksize' filepath='/usr/include/pthread.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-230'/>
-      <parameter type-id='type-id-15'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-226'>
       <parameter type-id='type-id-2'/>
@@ -3879,34 +3886,34 @@
       <var-decl name='sig_ign' type-id='type-id-99' mangled-name='_ZN11__sanitizer7sig_ignE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='178' column='1'/>
       <var-decl name='sig_dfl' type-id='type-id-99' mangled-name='_ZN11__sanitizer7sig_dflE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='179' column='1'/>
       <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'/>
-      <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='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_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='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_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='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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
       <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'/>
       <var-decl name='struct_user_regs_struct_sz' type-id='type-id-149' mangled-name='_ZN11__sanitizer26struct_user_regs_struct_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='215' column='1'/>
       <var-decl name='struct_user_fpregs_struct_sz' type-id='type-id-149' mangled-name='_ZN11__sanitizer28struct_user_fpregs_struct_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='216' column='1'/>
       <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'/>
-      <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_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_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_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_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_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_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_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_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_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_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_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_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_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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
+      <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'/>
       <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'/>
       <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'/>
-      <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_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_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_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_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'/>
+      <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'/>
+      <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'/>
+      <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'/>
       <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'/>
       <var-decl name='struct_ifreq_sz' type-id='type-id-149' mangled-name='_ZN11__sanitizer15struct_ifreq_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='247' column='1'/>
       <var-decl name='struct_termios_sz' type-id='type-id-149' mangled-name='_ZN11__sanitizer17struct_termios_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='248' column='1'/>
@@ -4375,7 +4382,7 @@
       <var-decl name='struct_sigaction_sz' type-id='type-id-149' mangled-name='_ZN11__sanitizer19struct_sigaction_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='130' column='1'/>
       <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>
-    <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-decl name='__sanitizer'>
@@ -4438,7 +4445,7 @@
       </function-decl>
       <function-decl name='Atexit' mangled-name='_ZN11__sanitizer6AtexitEPFvvE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-125' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='getuid' filepath='/usr/include/unistd.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4449,14 +4456,14 @@
     </function-decl>
     <function-decl name='madvise' filepath='/usr/include/sys/mman.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='setrlimit' filepath='/usr/include/sys/resource.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-240'/>
       <parameter type-id='type-id-239'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='sleep' filepath='/usr/include/unistd.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-149' name='sec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1'/>
@@ -4464,18 +4471,18 @@
     </function-decl>
     <function-decl name='usleep' filepath='/usr/include/unistd.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-236'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='514' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-125' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='isatty' filepath='/usr/include/unistd.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4485,7 +4492,7 @@
         <var-decl name='rlim_max' type-id='type-id-241' visibility='default' filepath='/usr/include/bits/resource.h' line='140' column='1'/>
       </data-member>
     </class-decl>
-    <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-decl name='rlim_t' type-id='type-id-242' filepath='/usr/include/bits/resource.h' line='127' column='1' id='type-id-241'/>
     <typedef-decl name='__rlim_t' type-id='type-id-33' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-242'/>
   </abi-instr>
@@ -4494,10 +4501,10 @@
     <namespace-decl name='__sanitizer'>
       <function-decl name='VSNPrintf' mangled-name='_ZN11__sanitizer9VSNPrintfEPciPKcP13__va_list_tag' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-245'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <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'>
         <parameter type-id='type-id-244'/>
@@ -4642,7 +4649,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-250' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -4816,7 +4823,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedStackSpaceWithGuard' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-275' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -4838,7 +4845,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedSetTracerPID' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-273' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -4891,7 +4898,7 @@
       </class-decl>
       <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'>
-          <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'>
           <function-decl name='StopTheWorldScope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4902,13 +4909,13 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~StopTheWorldScope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-277' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-1'/>
         <parameter type-id='type-id-1'/>
         <return type-id='type-id-4'/>
@@ -4992,7 +4999,7 @@
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-131'/>
             <parameter type-id='type-id-131'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -5036,12 +5043,12 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <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-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-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>
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-289'/>
     <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-292'/>
@@ -5066,7 +5073,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-296' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -5166,7 +5173,7 @@
     <qualified-type-def type-id='type-id-278' const='yes' id='type-id-302'/>
     <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-299'/>
     <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-300'/>
-    <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'/>
     <qualified-type-def type-id='type-id-291' const='yes' id='type-id-305'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.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'>
@@ -5194,7 +5201,7 @@
     <function-type size-in-bits='64' id='type-id-36'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
     <class-decl name='backtrace_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-306'/>
@@ -5372,10 +5379,10 @@
           <var-decl name='path_' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='294' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <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'>
-          <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'>
           <var-decl name='kBufferSize' type-id='type-id-128' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='298' column='1'/>
@@ -5500,28 +5507,28 @@
       <function-decl name='__sanitizer_symbolize_demangle' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
-        <return type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <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'>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-198'/>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-124'/>
       </function-decl>
       <function-decl name='__sanitizer_symbolize_code' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-198'/>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-124'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-270'/>
       <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-270'/>
     </function-decl>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-326'/>
@@ -5543,7 +5550,7 @@
             <member-function access='public' destructor='yes'>
               <function-decl name='~SymbolizerScope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-320' is-artificial='yes'/>
-                <parameter type-id='type-id-8' is-artificial='yes'/>
+                <parameter type-id='type-id-10' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -5557,7 +5564,7 @@
             <member-function access='public' destructor='yes'>
               <function-decl name='~SymbolizerScope' mangled-name='_ZN11__sanitizer10Symbolizer15SymbolizerScopeD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-320' is-artificial='yes'/>
-                <parameter type-id='type-id-8' is-artificial='yes'/>
+                <parameter type-id='type-id-10' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -5696,7 +5703,7 @@
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-198'/>
       <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-124'/>
     </function-type>
     <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-333'/>
@@ -5718,10 +5725,10 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='31' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <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'>
-          <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'>
           <function-decl name='AddressInfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5772,7 +5779,7 @@
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.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'>
   </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'>
-    <type-decl name='int' size-in-bits='32' id='type-id-8'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-156'/>
     <array-type-def dimensions='1' type-id='type-id-156' size-in-bits='1048576' id='type-id-334'>
       <subrange length='16384' type-id='type-id-50' id='type-id-309'/>
@@ -5859,7 +5866,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-340' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -6163,13 +6170,13 @@
           <var-decl name='handle_ioctl' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='224'>
-          <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'>
           <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <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'>
           <var-decl name='detect_leaks' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
@@ -6228,25 +6235,25 @@
           <var-decl name='print_benign' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='608'>
-          <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'>
           <var-decl name='halt_on_error' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='672'>
-          <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'>
           <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
-          <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'>
-          <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'>
-          <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'>
           <var-decl name='stop_on_start' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
@@ -6255,10 +6262,10 @@
           <var-decl name='running_on_valgrind' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <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'>
-          <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>
@@ -6371,7 +6378,7 @@
       <member-function access='public' destructor='yes'>
         <function-decl name='~BlockingCall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-398' is-artificial='yes'/>
-          <parameter type-id='type-id-8' is-artificial='yes'/>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-4'/>
         </function-decl>
       </member-function>
@@ -6400,7 +6407,7 @@
       <member-function access='public' destructor='yes'>
         <function-decl name='~ScopedSyscall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1930' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-403' is-artificial='yes'/>
-          <parameter type-id='type-id-8' is-artificial='yes'/>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-4'/>
         </function-decl>
       </member-function>
@@ -6425,7 +6432,7 @@
         <var-decl name='is_on_exits_' type-id='type-id-373' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='336' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='17472'>
-        <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'>
         <function-decl name='AtExitContext' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='283' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6441,7 +6448,7 @@
           <parameter type-id='type-id-124'/>
           <parameter type-id='type-id-405'/>
           <parameter type-id='type-id-1'/>
-          <return type-id='type-id-8'/>
+          <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -6478,7 +6485,7 @@
       <member-function access='public' destructor='yes'>
         <function-decl name='~ScopedInterceptor' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-411' is-artificial='yes'/>
-          <parameter type-id='type-id-8' is-artificial='yes'/>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-4'/>
         </function-decl>
       </member-function>
@@ -6494,7 +6501,7 @@
       <member-function access='public' destructor='yes'>
         <function-decl name='~ScopedInterceptor' mangled-name='_ZN17ScopedInterceptorD2Ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-411' is-artificial='yes'/>
-          <parameter type-id='type-id-8' is-artificial='yes'/>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-4'/>
         </function-decl>
       </member-function>
@@ -6504,7 +6511,7 @@
         <var-decl name='msg_name' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <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'>
         <var-decl name='msg_iov' type-id='type-id-413' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='96' column='1'/>
@@ -6574,7 +6581,7 @@
         <var-decl name='sa_mask' type-id='type-id-437' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <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'>
         <var-decl name='sa_restorer' type-id='type-id-125' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='98' column='1'/>
@@ -7212,7 +7219,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-941' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -7315,7 +7322,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-939' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -7628,7 +7635,7 @@
       </class-decl>
       <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'>
-          <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'>
           <var-decl name='events' type-id='type-id-77' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='481' column='1'/>
@@ -7648,7 +7655,7 @@
           <var-decl name='name' type-id='type-id-42' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='130' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <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'>
           <var-decl name='oldval' type-id='type-id-1' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='132' column='1'/>
@@ -7695,10 +7702,10 @@
           <var-decl name='mnt_opts' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='280' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <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'>
-          <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>
       <class-decl name='__sanitizer_sigset_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='397' column='1' id='type-id-437'>
@@ -7760,7 +7767,7 @@
           <var-decl name='msg_controllen' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='308' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <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>
       <class-decl name='__sanitizer_hostent' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='471' column='1' id='type-id-978'>
@@ -7771,10 +7778,10 @@
           <var-decl name='h_aliases' type-id='type-id-130' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='473' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <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'>
-          <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'>
           <var-decl name='h_addr_list' type-id='type-id-130' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='476' column='1'/>
@@ -7782,31 +7789,31 @@
       </class-decl>
       <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
-          <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'>
           <var-decl name='tm_gmtoff' type-id='type-id-45' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='271' column='1'/>
@@ -7818,8 +7825,8 @@
       <typedef-decl name='OFF64_T' type-id='type-id-198' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='85' column='1' id='type-id-430'/>
       <typedef-decl name='OFF_T' type-id='type-id-198' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='81' column='1' id='type-id-197'/>
       <function-decl name='ToLower' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
-        <return type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <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'>
         <parameter type-id='type-id-199'/>
@@ -7834,9 +7841,9 @@
         <return type-id='type-id-149'/>
       </function-decl>
       <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 type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
-        <return type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <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'>
         <parameter type-id='type-id-1064'/>
@@ -7865,7 +7872,7 @@
       </function-decl>
       <function-decl name='internal_strchr' mangled-name='_ZN11__sanitizer15internal_strchrEPKci' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-28'/>
       </function-decl>
       <function-decl name='internal_atoll' mangled-name='_ZN11__sanitizer14internal_atollEPKc' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7881,7 +7888,7 @@
         <return type-id='type-id-99'/>
       </function-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_strncpy' mangled-name='_ZN11__sanitizer16internal_strncpyEPcPKcm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7907,7 +7914,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <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 type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-202'/>
         <parameter type-id='type-id-202'/>
         <return type-id='type-id-99'/>
@@ -7947,13 +7954,13 @@
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-124'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <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'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='MutexRepair' mangled-name='_ZN6__tsan11MutexRepairEPNS_11ThreadStateEmm' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7965,32 +7972,32 @@
       <function-decl name='FdEventCreate' mangled-name='_ZN6__tsan13FdEventCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdAcquire' mangled-name='_ZN6__tsan9FdAcquireEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdSocketAccept' mangled-name='_ZN6__tsan14FdSocketAcceptEPNS_11ThreadStateEmii' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdAccess' mangled-name='_ZN6__tsan8FdAccessEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdRelease' mangled-name='_ZN6__tsan9FdReleaseEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdOnFork' mangled-name='_ZN6__tsan8FdOnForkEPNS_11ThreadStateEm' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8005,13 +8012,13 @@
       <function-decl name='FdClose' mangled-name='_ZN6__tsan7FdCloseEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdFileCreate' mangled-name='_ZN6__tsan12FdFileCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='File2addr' mangled-name='_ZN6__tsan9File2addrEPc' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8021,51 +8028,51 @@
       <function-decl name='FdPipeCreate' mangled-name='_ZN6__tsan12FdPipeCreateEPNS_11ThreadStateEmii' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdPollCreate' mangled-name='_ZN6__tsan12FdPollCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdSocketConnecting' mangled-name='_ZN6__tsan18FdSocketConnectingEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdSocketConnect' mangled-name='_ZN6__tsan15FdSocketConnectEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdSocketCreate' mangled-name='_ZN6__tsan14FdSocketCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdInotifyCreate' mangled-name='_ZN6__tsan15FdInotifyCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdSignalCreate' mangled-name='_ZN6__tsan14FdSignalCreateEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='FdDup' mangled-name='_ZN6__tsan5FdDupEPNS_11ThreadStateEmii' filepath='../../.././libsanitizer/tsan/tsan_fd.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='MutexReadOrWriteUnlock' mangled-name='_ZN6__tsan22MutexReadOrWriteUnlockEPNS_11ThreadStateEmm' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8136,35 +8143,35 @@
     <function-decl name='__interceptor_mlock' mangled-name='mlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mlock'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
       <parameter type-id='type-id-99' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
       <parameter type-id='type-id-99' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_recvmsg' mangled-name='__sanitizer_syscall_post_impl_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmsg'>
       <parameter type-id='type-id-45' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
@@ -11667,7 +11674,7 @@
     <function-decl name='__interceptor_getdelim' mangled-name='__interceptor_getdelim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getdelim'>
       <parameter type-id='type-id-130' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <parameter type-id='type-id-935' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
-      <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 type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
@@ -11680,12 +11687,12 @@
     <function-decl name='__interceptor_lrand48_r' mangled-name='__interceptor_lrand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lrand48_r'>
       <parameter type-id='type-id-1' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
       <parameter type-id='type-id-1181' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
       <parameter type-id='type-id-1072' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-381' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2802' column='1'/>
@@ -11753,7 +11760,7 @@
     <function-decl name='__interceptor_pthread_setname_np' mangled-name='__interceptor_pthread_setname_np' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_setname_np'>
       <parameter type-id='type-id-99' name='thread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1'/>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='dir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
@@ -11772,59 +11779,59 @@
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1'/>
       <parameter type-id='type-id-418' name='cpusetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1'/>
       <parameter type-id='type-id-1' name='cpuset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <parameter type-id='type-id-232' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <parameter type-id='type-id-935' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
       <parameter type-id='type-id-1011' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-8' name='shmid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
-      <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='shmid' 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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
@@ -11840,17 +11847,17 @@
       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <parameter type-id='type-id-975' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <parameter type-id='type-id-975' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
       <parameter type-id='type-id-975' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1'/>
@@ -11863,53 +11870,53 @@
     <function-decl name='__interceptor_initgroups' mangled-name='initgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='initgroups'>
       <parameter type-id='type-id-28' name='user' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
       <parameter type-id='type-id-196' name='group' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <parameter type-id='type-id-993' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
-      <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'/>
       <return type-id='type-id-993'/>
     </function-decl>
     <function-decl name='__interceptor_getmntent' mangled-name='__interceptor_getmntent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getmntent'>
@@ -11918,140 +11925,140 @@
     </function-decl>
     <function-decl name='__interceptor_pthread_cond_broadcast' mangled-name='__interceptor_pthread_cond_broadcast' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_broadcast'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <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 type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor__exit' mangled-name='_exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_exit'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__interceptor_backtrace_symbols' mangled-name='__interceptor_backtrace_symbols' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_backtrace_symbols'>
       <parameter type-id='type-id-232' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <return type-id='type-id-130'/>
     </function-decl>
     <function-decl name='__interceptor_backtrace' mangled-name='__interceptor_backtrace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_backtrace'>
       <parameter type-id='type-id-232' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigprocmask' mangled-name='__interceptor_sigprocmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigprocmask'>
-      <parameter type-id='type-id-8' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
+      <parameter type-id='type-id-10' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <parameter type-id='type-id-1002' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigpending' mangled-name='sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigpending'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigfillset' mangled-name='sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigfillset'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigemptyset' mangled-name='__interceptor_sigemptyset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigemptyset'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigtimedwait' mangled-name='__interceptor_sigtimedwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigtimedwait'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <parameter type-id='type-id-1' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <parameter type-id='type-id-1' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigwaitinfo' mangled-name='sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigwaitinfo'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <parameter type-id='type-id-1' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigwait' mangled-name='__interceptor_sigwait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwait'>
       <parameter type-id='type-id-1002' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <parameter type-id='type-id-42' name='sig' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_wordexp' mangled-name='__interceptor_wordexp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wordexp'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <parameter type-id='type-id-1008' name='p' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_ppoll' mangled-name='ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppoll'>
       <parameter type-id='type-id-1001' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <parameter type-id='type-id-1250' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <parameter type-id='type-id-1' name='timeout_ts' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <parameter type-id='type-id-1002' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_poll' mangled-name='poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='poll'>
       <parameter type-id='type-id-1001' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <parameter type-id='type-id-1250' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
-      <parameter type-id='type-id-8' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_getgroups' mangled-name='__interceptor_getgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getgroups'>
-      <parameter type-id='type-id-8' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
+      <parameter type-id='type-id-10' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
       <parameter type-id='type-id-1011' name='lst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_scandir64' mangled-name='__interceptor_scandir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir64'>
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <parameter type-id='type-id-973' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <parameter type-id='type-id-422' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <parameter type-id='type-id-424' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_scandir' mangled-name='__interceptor_scandir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir'>
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <parameter type-id='type-id-968' name='namelist' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <parameter type-id='type-id-426' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <parameter type-id='type-id-428' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xpg_strerror_r'>
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_strerror_r' mangled-name='strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strerror_r'>
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_strerror' mangled-name='__interceptor_strerror' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strerror'>
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_sched_getaffinity' mangled-name='sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_getaffinity'>
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <parameter type-id='type-id-418' name='cpusetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
       <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_confstr' mangled-name='confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='confstr'>
-      <parameter type-id='type-id-8' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
+      <parameter type-id='type-id-10' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <parameter type-id='type-id-418' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
       <return type-id='type-id-418'/>
@@ -12061,9 +12068,9 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_tcgetattr' mangled-name='__interceptor_tcgetattr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tcgetattr'>
-      <parameter type-id='type-id-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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_wcsnrtombs' mangled-name='__interceptor_wcsnrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsnrtombs'>
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
@@ -12110,17 +12117,17 @@
     <function-decl name='__interceptor_strtoumax' mangled-name='strtoumax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strtoumax'>
       <parameter type-id='type-id-2' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <parameter type-id='type-id-130' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
-      <parameter type-id='type-id-8' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <return type-id='type-id-429'/>
     </function-decl>
     <function-decl name='__interceptor_strtoimax' mangled-name='strtoimax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strtoimax'>
       <parameter type-id='type-id-2' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <parameter type-id='type-id-130' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
-      <parameter type-id='type-id-8' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
+      <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <return type-id='type-id-429'/>
     </function-decl>
     <function-decl name='__interceptor_get_current_dir_name' mangled-name='get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_current_dir_name'>
-      <parameter type-id='type-id-8' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
+      <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_getcwd' mangled-name='getcwd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getcwd'>
@@ -12129,13 +12136,13 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_setlocale' mangled-name='__interceptor_setlocale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setlocale'>
-      <parameter type-id='type-id-8' name='category' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
+      <parameter type-id='type-id-10' name='category' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
       <parameter type-id='type-id-28' name='locale' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1570' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_ptrace' mangled-name='__interceptor_ptrace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ptrace'>
-      <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-8' name='pid' 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 type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
       <parameter type-id='type-id-1' name='data' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1'/>
       <return type-id='type-id-99'/>
@@ -12144,7 +12151,7 @@
       <parameter type-id='type-id-1' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <parameter type-id='type-id-970' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <parameter type-id='type-id-972' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_readdir64' mangled-name='__interceptor_readdir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir64'>
       <parameter type-id='type-id-1' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1'/>
@@ -12154,7 +12161,7 @@
       <parameter type-id='type-id-1' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <parameter type-id='type-id-965' name='entry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <parameter type-id='type-id-967' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_readdir' mangled-name='__interceptor_readdir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir'>
       <parameter type-id='type-id-1' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1'/>
@@ -12162,18 +12169,18 @@
     </function-decl>
     <function-decl name='__interceptor_sysinfo' mangled-name='sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysinfo'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_getpeername' mangled-name='getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getpeername'>
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_recvmsg' mangled-name='__interceptor_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recvmsg'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <parameter type-id='type-id-997' name='msg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_modfl' mangled-name='modfl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='modfl'>
@@ -12192,35 +12199,35 @@
       <return type-id='type-id-376'/>
     </function-decl>
     <function-decl name='__interceptor_accept4' mangled-name='__interceptor_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_accept4'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
-      <parameter type-id='type-id-8' name='f' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='f' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1346' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_accept' mangled-name='__interceptor_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_accept'>
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
       <parameter type-id='type-id-155' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_getsockopt' mangled-name='__interceptor_getsockopt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getsockopt'>
-      <parameter type-id='type-id-8' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
-      <parameter type-id='type-id-8' name='level' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
-      <parameter type-id='type-id-8' name='optname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='level' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
+      <parameter type-id='type-id-10' name='optname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <parameter type-id='type-id-1' name='optval' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
       <parameter type-id='type-id-42' name='optlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1307' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname2_r' mangled-name='__interceptor_gethostbyname2_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2_r'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-979' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-984' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname_r' mangled-name='gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname_r'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
@@ -12229,18 +12236,18 @@
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <parameter type-id='type-id-984' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyaddr_r' mangled-name='gethostbyaddr_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyaddr_r'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-979' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-984' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gethostent_r' mangled-name='__interceptor_gethostent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent_r'>
       <parameter type-id='type-id-979' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
@@ -12248,21 +12255,21 @@
       <parameter type-id='type-id-418' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <parameter type-id='type-id-984' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname2' mangled-name='__interceptor_gethostbyname2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <return type-id='type-id-979'/>
     </function-decl>
     <function-decl name='__interceptor_gethostent' mangled-name='__interceptor_gethostent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostent'>
-      <parameter type-id='type-id-8' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
+      <parameter type-id='type-id-10' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
       <return type-id='type-id-979'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyaddr' mangled-name='__interceptor_gethostbyaddr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyaddr'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
+      <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <return type-id='type-id-979'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname' mangled-name='gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname'>
@@ -12270,164 +12277,164 @@
       <return type-id='type-id-979'/>
     </function-decl>
     <function-decl name='__interceptor_getsockname' mangled-name='__interceptor_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getsockname'>
-      <parameter type-id='type-id-8' name='sock_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
+      <parameter type-id='type-id-10' name='sock_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
       <parameter type-id='type-id-42' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1142' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_getschedparam' mangled-name='__interceptor_pthread_getschedparam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_getschedparam'>
       <parameter type-id='type-id-99' name='thread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1'/>
       <parameter type-id='type-id-42' name='policy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1'/>
       <parameter type-id='type-id-42' name='param' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_inet_aton' mangled-name='inet_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inet_aton'>
       <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_inet_pton' mangled-name='__interceptor_inet_pton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inet_pton'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_inet_ntop' mangled-name='__interceptor_inet_ntop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inet_ntop'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <parameter type-id='type-id-1' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <parameter type-id='type-id-28' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <parameter type-id='type-id-196' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_wait4' mangled-name='wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait4'>
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
       <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_wait3' mangled-name='wait3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait3'>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
       <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_waitpid' mangled-name='__interceptor_waitpid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitpid'>
-      <parameter type-id='type-id-8' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
+      <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_waitid' mangled-name='waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='waitid'>
-      <parameter type-id='type-id-8' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
-      <parameter type-id='type-id-8' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <parameter type-id='type-id-10' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <parameter type-id='type-id-10' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
       <parameter type-id='type-id-1' name='infop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
-      <parameter type-id='type-id-8' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_wait' mangled-name='__interceptor_wait' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wait'>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_setitimer' mangled-name='__interceptor_setitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_setitimer'>
-      <parameter type-id='type-id-8' name='which' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
+      <parameter type-id='type-id-10' name='which' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <parameter type-id='type-id-1' name='new_value' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
       <parameter type-id='type-id-1' name='old_value' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_getitimer' mangled-name='getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getitimer'>
-      <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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_clock_settime' mangled-name='clock_settime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_settime'>
       <parameter type-id='type-id-196' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_clock_gettime' mangled-name='clock_gettime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_gettime'>
       <parameter type-id='type-id-196' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_clock_getres' mangled-name='__interceptor_clock_getres' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_clock_getres'>
       <parameter type-id='type-id-196' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
       <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_ioctl' mangled-name='ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ioctl'>
-      <parameter type-id='type-id-8' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
+      <parameter type-id='type-id-10' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-149' name='request' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
       <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vfscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_fscanf' mangled-name='__isoc99_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_fscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vsscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_sscanf' mangled-name='__isoc99_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_sscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vscanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_scanf' mangled-name='__isoc99_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_scanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_vfscanf' mangled-name='vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vfscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_fscanf' mangled-name='__interceptor_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fscanf'>
       <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_vsscanf' mangled-name='__interceptor_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vsscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sscanf' mangled-name='sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'>
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_vscanf' mangled-name='vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
       <parameter type-id='type-id-245' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_scanf' mangled-name='scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scanf'>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_strptime' mangled-name='__interceptor_strptime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strptime'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
@@ -12476,89 +12483,89 @@
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='__interceptor_prctl' mangled-name='prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='prctl'>
-      <parameter type-id='type-id-8' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
+      <parameter type-id='type-id-10' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <parameter type-id='type-id-33' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <parameter type-id='type-id-33' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <parameter type-id='type-id-33' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
       <parameter type-id='type-id-33' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pwritev64' mangled-name='pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev64'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_pwritev' mangled-name='pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_writev' mangled-name='__interceptor_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_writev'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_pwrite64' mangled-name='pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite64'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <parameter type-id='type-id-431' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_pwrite' mangled-name='pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-418' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_write' mangled-name='write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='write'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-418' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_preadv64' mangled-name='preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv64'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_preadv' mangled-name='preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_readv' mangled-name='readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='readv'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <parameter type-id='type-id-991' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
-      <parameter type-id='type-id-8' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
+      <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_pread64' mangled-name='__interceptor_pread64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread64'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-418' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <parameter type-id='type-id-431' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='253' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_pread' mangled-name='__interceptor_pread' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pread'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-418' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <parameter type-id='type-id-432' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
       <return type-id='type-id-420'/>
     </function-decl>
     <function-decl name='__interceptor_read' mangled-name='read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='read'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <parameter type-id='type-id-418' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
       <return type-id='type-id-420'/>
@@ -12582,86 +12589,86 @@
       <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
       <parameter type-id='type-id-418' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_strcasecmp' mangled-name='__interceptor_strcasecmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strcasecmp'>
       <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_strncmp' mangled-name='__interceptor_strncmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncmp'>
       <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
       <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_strcmp' mangled-name='__interceptor_strcmp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strcmp'>
       <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
       <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_textdomain' mangled-name='textdomain' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='textdomain'>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_fork' mangled-name='__interceptor_fork' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fork'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_getaddrinfo' mangled-name='__interceptor_getaddrinfo' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getaddrinfo'>
       <parameter type-id='type-id-1' name='node' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
       <parameter type-id='type-id-1' name='service' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
       <parameter type-id='type-id-1' name='hints' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
       <parameter type-id='type-id-1' name='rv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_gettimeofday' mangled-name='gettimeofday' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gettimeofday'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_kill' mangled-name='pthread_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_kill'>
       <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_kill' mangled-name='__interceptor_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_kill'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigsuspend' mangled-name='__interceptor_sigsuspend' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigsuspend'>
       <parameter type-id='type-id-1053' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sigaction' mangled-name='sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigaction'>
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <parameter type-id='type-id-1186' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
       <parameter type-id='type-id-1186' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_signal' mangled-name='__interceptor_signal' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_signal'>
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
       <parameter type-id='type-id-435' name='h' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1'/>
       <return type-id='type-id-435'/>
     </function-decl>
     <function-decl name='__interceptor_epoll_wait' mangled-name='epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_wait'>
-      <parameter type-id='type-id-8' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
       <parameter type-id='type-id-1' name='ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
-      <parameter type-id='type-id-8' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
-      <parameter type-id='type-id-8' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_epoll_ctl' mangled-name='epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_ctl'>
-      <parameter type-id='type-id-8' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
-      <parameter type-id='type-id-8' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
       <parameter type-id='type-id-1' name='ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_opendir' mangled-name='__interceptor_opendir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_opendir'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1'/>
@@ -12669,19 +12676,19 @@
     </function-decl>
     <function-decl name='__interceptor_rmdir' mangled-name='rmdir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rmdir'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_puts' mangled-name='__interceptor_puts' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_puts'>
       <parameter type-id='type-id-2' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_abort' mangled-name='abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='abort'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__interceptor_fflush' mangled-name='__interceptor_fflush' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fflush'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_fwrite' mangled-name='fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fwrite'>
       <parameter type-id='type-id-1' name='p' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
@@ -12699,7 +12706,7 @@
     </function-decl>
     <function-decl name='__interceptor_fclose' mangled-name='__interceptor_fclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fclose'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_freopen' mangled-name='__interceptor_freopen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_freopen'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1524' column='1'/>
@@ -12714,36 +12721,36 @@
     </function-decl>
     <function-decl name='__interceptor_unlink' mangled-name='unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlink'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_recv' mangled-name='recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='recv'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-438' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <return type-id='type-id-438'/>
     </function-decl>
     <function-decl name='__interceptor_sendmsg' mangled-name='__interceptor_sendmsg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sendmsg'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <parameter type-id='type-id-1' name='msg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
       <return type-id='type-id-438'/>
     </function-decl>
     <function-decl name='__interceptor_send' mangled-name='send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='send'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <parameter type-id='type-id-438' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
       <return type-id='type-id-438'/>
     </function-decl>
     <function-decl name='__interceptor_pipe2' mangled-name='__interceptor_pipe2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pipe2'>
       <parameter type-id='type-id-42' name='pipefd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1466' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pipe' mangled-name='__interceptor_pipe' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pipe'>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___res_iclose' mangled-name='__interceptor___res_iclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___res_iclose'>
       <parameter type-id='type-id-1' name='state' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1447' column='1'/>
@@ -12751,327 +12758,327 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__interceptor___close' mangled-name='__interceptor___close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___close'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_close' mangled-name='close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='close'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_epoll_create1' mangled-name='epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_create1'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_epoll_create' mangled-name='__interceptor_epoll_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_listen' mangled-name='__interceptor_listen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_listen'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_bind' mangled-name='bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bind'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-149' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_connect' mangled-name='connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='connect'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
       <parameter type-id='type-id-149' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_socketpair' mangled-name='__interceptor_socketpair' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_socketpair'>
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
       <parameter type-id='type-id-42' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1383' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_socket' mangled-name='__interceptor_socket' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_socket'>
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_inotify_init1' mangled-name='inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inotify_init1'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_inotify_init' mangled-name='__interceptor_inotify_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_signalfd' mangled-name='signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='signalfd'>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
       <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_eventfd' mangled-name='eventfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='eventfd'>
       <parameter type-id='type-id-149' name='initval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_dup3' mangled-name='__interceptor_dup3' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup3'>
-      <parameter type-id='type-id-8' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <parameter type-id='type-id-8' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <parameter type-id='type-id-8' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='domain' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_dup2' mangled-name='dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup2'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_dup' mangled-name='dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_creat64' mangled-name='__interceptor_creat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_creat64'>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_creat' mangled-name='__interceptor_creat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_creat'>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1309' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_open64' mangled-name='__interceptor_open64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_open64'>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_open' mangled-name='open' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='open'>
       <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <parameter type-id='type-id-8' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_fstat64' mangled-name='__interceptor_fstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstat64'>
-      <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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___fxstat64' mangled-name='__interceptor___fxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___fxstat64'>
-      <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-8' name='cmd' 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 type-id='type-id-10' name='cmd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_fstat' mangled-name='__interceptor_fstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstat'>
-      <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 type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___fxstat' mangled-name='__interceptor___fxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___fxstat'>
-      <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-8' name='cmd' 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 type-id='type-id-10' name='cmd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
       <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_lstat64' mangled-name='lstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lstat64'>
       <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___lxstat64' mangled-name='__lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat64'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_lstat' mangled-name='__interceptor_lstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lstat'>
       <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___lxstat' mangled-name='__lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_stat64' mangled-name='__interceptor_stat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_stat64'>
       <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___xstat64' mangled-name='__xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xstat64'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_stat' mangled-name='stat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stat'>
       <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor___xstat' mangled-name='__interceptor___xstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xstat'>
-      <parameter type-id='type-id-8' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
+      <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_getvalue' mangled-name='__interceptor_sem_getvalue' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_getvalue'>
       <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
       <parameter type-id='type-id-42' name='sval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_post' mangled-name='__interceptor_sem_post' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_post'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_timedwait' mangled-name='sem_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_timedwait'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_trywait' mangled-name='__interceptor_sem_trywait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_trywait'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_wait' mangled-name='__interceptor_sem_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_wait'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_destroy' mangled-name='sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sem_init' mangled-name='sem_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_init'>
       <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
-      <parameter type-id='type-id-8' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
+      <parameter type-id='type-id-10' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
       <parameter type-id='type-id-149' name='value' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_once' mangled-name='pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_once'>
       <parameter type-id='type-id-1' name='o' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
       <parameter type-id='type-id-125' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_barrier_wait' mangled-name='__interceptor_pthread_barrier_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_wait'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_barrier_destroy' mangled-name='__interceptor_pthread_barrier_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_barrier_init' mangled-name='pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_barrier_init'>
       <parameter type-id='type-id-1' name='b' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-1' name='a' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
       <parameter type-id='type-id-149' name='count' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_cond_timedwait' mangled-name='__interceptor_pthread_cond_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_timedwait'>
       <parameter type-id='type-id-1' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1'/>
       <parameter type-id='type-id-1' name='m' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1'/>
       <parameter type-id='type-id-1' name='abstime' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1097' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_cond_destroy' mangled-name='__interceptor_pthread_cond_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_unlock' mangled-name='__interceptor_pthread_rwlock_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_unlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_timedwrlock' mangled-name='__interceptor_pthread_rwlock_timedwrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1074' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_timedwrlock'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_trywrlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_wrlock' mangled-name='__interceptor_pthread_rwlock_wrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1056' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_wrlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_timedrdlock' mangled-name='pthread_rwlock_timedrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_timedrdlock'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_tryrdlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_rdlock' mangled-name='__interceptor_pthread_rwlock_rdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_rdlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_destroy' mangled-name='__interceptor_pthread_rwlock_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_rwlock_init' mangled-name='__interceptor_pthread_rwlock_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_init'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_spin_unlock' mangled-name='__interceptor_pthread_spin_unlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_unlock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_spin_trylock' mangled-name='__interceptor_pthread_spin_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_trylock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_spin_lock' mangled-name='pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_lock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_spin_destroy' mangled-name='__interceptor_pthread_spin_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_spin_init' mangled-name='pthread_spin_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_init'>
       <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
-      <parameter type-id='type-id-8' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_mutex_timedlock' mangled-name='__interceptor_pthread_mutex_timedlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_timedlock'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_trylock'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_mutex_destroy' mangled-name='__interceptor_pthread_mutex_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_destroy'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_mutex_init' mangled-name='pthread_mutex_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_init'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_detach' mangled-name='__interceptor_pthread_detach' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_detach'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_join' mangled-name='__interceptor_pthread_join' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_join'>
       <parameter type-id='type-id-1' name='th' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1'/>
       <parameter type-id='type-id-232' name='ret' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='904' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_create' mangled-name='__interceptor_pthread_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_create'>
       <parameter type-id='type-id-1' name='th' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <parameter type-id='type-id-1232' name='callback' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
       <parameter type-id='type-id-1' name='param' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='875' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__cxa_guard_abort' mangled-name='__cxa_guard_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_abort'>
       <parameter type-id='type-id-1009' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='815' column='1'/>
@@ -13083,13 +13090,13 @@
     </function-decl>
     <function-decl name='__cxa_guard_acquire' mangled-name='__cxa_guard_acquire' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_guard_acquire'>
       <parameter type-id='type-id-1009' name='g' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='793' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_posix_memalign' mangled-name='__interceptor_posix_memalign' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_posix_memalign'>
       <parameter type-id='type-id-232' name='memptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1'/>
       <parameter type-id='type-id-99' name='align' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1'/>
       <parameter type-id='type-id-99' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='786' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_pvalloc' mangled-name='__interceptor_pvalloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pvalloc'>
       <parameter type-id='type-id-99' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1'/>
@@ -13107,23 +13114,23 @@
     <function-decl name='__interceptor_munmap' mangled-name='__interceptor_munmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munmap'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='763' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_mmap64' mangled-name='__interceptor_mmap64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap64'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
-      <parameter type-id='type-id-8' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <parameter type-id='type-id-198' name='off' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__interceptor_mmap' mangled-name='mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap'>
       <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-438' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
-      <parameter type-id='type-id-8' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
-      <parameter type-id='type-id-8' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
-      <parameter type-id='type-id-8' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
+      <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <parameter type-id='type-id-149' name='off' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -13149,17 +13156,17 @@
     </function-decl>
     <function-decl name='__interceptor_strrchr' mangled-name='strrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strrchr'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_strchrnul' mangled-name='__interceptor_strchrnul' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strchrnul'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_strchr' mangled-name='__interceptor_strchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strchr'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_memmove' mangled-name='memmove' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memmove'>
@@ -13170,13 +13177,13 @@
     </function-decl>
     <function-decl name='__interceptor_memrchr' mangled-name='__interceptor_memrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memrchr'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
-      <parameter type-id='type-id-8' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
+      <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
       <parameter type-id='type-id-99' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='654' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__interceptor_memchr' mangled-name='__interceptor_memchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memchr'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -13184,7 +13191,7 @@
       <parameter type-id='type-id-1' name='s1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
       <parameter type-id='type-id-1' name='s2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
       <parameter type-id='type-id-99' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_memcpy' mangled-name='memcpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memcpy'>
       <parameter type-id='type-id-1'/>
@@ -13194,7 +13201,7 @@
     </function-decl>
     <function-decl name='__interceptor_memset' mangled-name='__interceptor_memset' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memset'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -13276,46 +13283,46 @@
     </function-decl>
     <function-decl name='__interceptor_siglongjmp' mangled-name='__interceptor_siglongjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_siglongjmp'>
       <parameter type-id='type-id-131' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
-      <parameter type-id='type-id-8' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
+      <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__interceptor_longjmp' mangled-name='longjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='longjmp'>
       <parameter type-id='type-id-131' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
-      <parameter type-id='type-id-8' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
+      <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__interceptor___cxa_atexit' mangled-name='__cxa_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_atexit'>
       <parameter type-id='type-id-470' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
       <parameter type-id='type-id-1' name='dso' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_on_exit' mangled-name='__interceptor_on_exit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_on_exit'>
       <parameter type-id='type-id-1221' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
       <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='349' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_atexit' mangled-name='__interceptor_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_atexit'>
       <parameter type-id='type-id-125' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='342' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_dlclose' mangled-name='__interceptor_dlclose' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlclose'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_dlopen' mangled-name='__interceptor_dlopen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dlopen'>
       <parameter type-id='type-id-2' name='filename' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
-      <parameter type-id='type-id-8' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
+      <parameter type-id='type-id-10' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='__interceptor_nanosleep' mangled-name='nanosleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nanosleep'>
       <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
       <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_usleep' mangled-name='__interceptor_usleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_usleep'>
       <parameter type-id='type-id-438' name='usec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__interceptor_sleep' mangled-name='sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sleep'>
       <parameter type-id='type-id-149' name='sec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1'/>
@@ -14278,36 +14285,36 @@
     <function-decl name='pthread_setspecific' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-149'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_yield' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_sigmask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-1053'/>
       <parameter type-id='type-id-1002'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_self' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='fileno_unlocked' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_mutexattr_gettype' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
       <parameter type-id='type-id-42' name='sval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1208' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_attr_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_attr_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__libc_malloc' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-99' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='780' column='1'/>
@@ -14324,14 +14331,14 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='mallopt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pthread_key_create' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-155'/>
       <parameter type-id='type-id-470'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
     <reference-type-def kind='lvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1241'/>
@@ -14356,7 +14363,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1258' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -14415,7 +14422,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1258' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -14461,17 +14468,17 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-981'>
       <parameter type-id='type-id-28' name='name'/>
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <return type-id='type-id-979'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-982'>
-      <parameter type-id='type-id-8' name='fake'/>
+      <parameter type-id='type-id-10' name='fake'/>
       <return type-id='type-id-979'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-983'>
       <parameter type-id='type-id-1' name='addr'/>
-      <parameter type-id='type-id-8' name='len'/>
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='len'/>
+      <parameter type-id='type-id-10' name='type'/>
       <return type-id='type-id-979'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-994'>
@@ -14482,7 +14489,7 @@
       <parameter type-id='type-id-1' name='fp'/>
       <parameter type-id='type-id-993' name='mntbuf'/>
       <parameter type-id='type-id-28' name='buf'/>
-      <parameter type-id='type-id-8' name='buflen'/>
+      <parameter type-id='type-id-10' name='buflen'/>
       <return type-id='type-id-993'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1005'>
@@ -14540,7 +14547,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1021'>
       <parameter type-id='type-id-28' name='s'/>
-      <parameter type-id='type-id-8' name='c'/>
+      <parameter type-id='type-id-10' name='c'/>
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1022'>
@@ -14558,22 +14565,22 @@
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1025'>
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1026'>
-      <parameter type-id='type-id-8' name='category'/>
+      <parameter type-id='type-id-10' name='category'/>
       <parameter type-id='type-id-28' name='locale'/>
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1027'>
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-418' name='buflen'/>
       <return type-id='type-id-28'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1028'>
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <parameter type-id='type-id-1' name='src'/>
       <parameter type-id='type-id-28' name='dst'/>
       <parameter type-id='type-id-196' name='size'/>
@@ -14590,7 +14597,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1031'>
       <parameter type-id='type-id-232' name='buffer'/>
-      <parameter type-id='type-id-8' name='size'/>
+      <parameter type-id='type-id-10' name='size'/>
       <return type-id='type-id-130'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1054'>
@@ -14639,7 +14646,7 @@
       <return type-id='type-id-377'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1078'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1079'>
       <parameter type-id='type-id-979' name='ret'/>
@@ -14647,69 +14654,69 @@
       <parameter type-id='type-id-418' name='buflen'/>
       <parameter type-id='type-id-984' name='result'/>
       <parameter type-id='type-id-42' name='h_errnop'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1080'>
       <parameter type-id='type-id-1001' name='fds'/>
       <parameter type-id='type-id-1250' name='nfds'/>
-      <parameter type-id='type-id-8' name='timeout'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='timeout'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1081'>
       <parameter type-id='type-id-1001' name='fds'/>
       <parameter type-id='type-id-1250' name='nfds'/>
       <parameter type-id='type-id-1' name='timeout_ts'/>
       <parameter type-id='type-id-1002' name='sigmask'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1082'>
       <parameter type-id='type-id-1002' name='set'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1083'>
       <parameter type-id='type-id-1002' name='set'/>
       <parameter type-id='type-id-42' name='sig'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1084'>
       <parameter type-id='type-id-1002' name='set'/>
       <parameter type-id='type-id-1' name='info'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1085'>
       <parameter type-id='type-id-1002' name='set'/>
       <parameter type-id='type-id-1' name='info'/>
       <parameter type-id='type-id-1' name='timeout'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1086'>
       <parameter type-id='type-id-28' name='path'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1087'>
       <parameter type-id='type-id-28' name='dirp'/>
       <parameter type-id='type-id-968' name='namelist'/>
       <parameter type-id='type-id-426' name='filter'/>
       <parameter type-id='type-id-428' name='compar'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1088'>
       <parameter type-id='type-id-28' name='dirp'/>
       <parameter type-id='type-id-973' name='namelist'/>
       <parameter type-id='type-id-422' name='filter'/>
       <parameter type-id='type-id-424' name='compar'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1089'>
       <parameter type-id='type-id-28' name='hostname'/>
       <parameter type-id='type-id-975' name='addr'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1090'>
       <parameter type-id='type-id-28' name='line'/>
       <parameter type-id='type-id-975' name='addr'/>
       <parameter type-id='type-id-28' name='hostname'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1091'>
       <parameter type-id='type-id-28' name='name'/>
@@ -14718,480 +14725,480 @@
       <parameter type-id='type-id-418' name='buflen'/>
       <parameter type-id='type-id-984' name='result'/>
       <parameter type-id='type-id-42' name='h_errnop'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1092'>
       <parameter type-id='type-id-28' name='s'/>
       <parameter type-id='type-id-1008' name='p'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1093'>
       <parameter type-id='type-id-28' name='name'/>
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <parameter type-id='type-id-979' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-418' name='buflen'/>
       <parameter type-id='type-id-984' name='result'/>
       <parameter type-id='type-id-42' name='h_errnop'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1094'>
       <parameter type-id='type-id-28' name='user'/>
       <parameter type-id='type-id-196' name='group'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1095'>
       <parameter type-id='type-id-28' name='path'/>
       <parameter type-id='type-id-1' name='buf'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1096'>
       <parameter type-id='type-id-1045'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1097'>
       <parameter type-id='type-id-1046'/>
       <parameter type-id='type-id-1046'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1098'>
       <parameter type-id='type-id-1048'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1099'>
       <parameter type-id='type-id-1049'/>
       <parameter type-id='type-id-1049'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1100'>
       <parameter type-id='type-id-1053' name='mask'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1101'>
       <parameter type-id='type-id-2' name='s'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1102'>
       <parameter type-id='type-id-2' name='s1'/>
       <parameter type-id='type-id-2' name='s2'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1103'>
       <parameter type-id='type-id-2' name='s1'/>
       <parameter type-id='type-id-2' name='s2'/>
       <parameter type-id='type-id-418' name='n'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1104'>
       <parameter type-id='type-id-2' name='s1'/>
       <parameter type-id='type-id-2' name='s2'/>
       <parameter type-id='type-id-99' name='size'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1105'>
       <parameter type-id='type-id-2' name='str'/>
       <parameter type-id='type-id-2' name='format'/>
       <parameter type-id='type-id-245' name='ap'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1106'>
       <parameter type-id='type-id-2' name='str'/>
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1107'>
       <parameter type-id='type-id-2' name='name'/>
-      <parameter type-id='type-id-8' name='mode'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='mode'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1108'>
       <parameter type-id='type-id-2' name='name'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <parameter type-id='type-id-8' name='mode'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <parameter type-id='type-id-10' name='mode'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1109'>
       <parameter type-id='type-id-2' name='format'/>
       <parameter type-id='type-id-245' name='ap'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1110'>
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1111'>
       <parameter type-id='type-id-2' name='cp'/>
       <parameter type-id='type-id-1' name='dst'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1112'>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1113'>
       <parameter type-id='type-id-42' name='status'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1114'>
       <parameter type-id='type-id-42' name='pipefd'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1115'>
       <parameter type-id='type-id-42' name='status'/>
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <parameter type-id='type-id-1' name='rusage'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1116'>
-      <parameter type-id='type-id-8' name='how'/>
+      <parameter type-id='type-id-10' name='how'/>
       <parameter type-id='type-id-1002' name='set'/>
       <parameter type-id='type-id-1002' name='oldset'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1117'>
-      <parameter type-id='type-id-8' name='size'/>
+      <parameter type-id='type-id-10' name='size'/>
       <parameter type-id='type-id-1011' name='lst'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1118'>
-      <parameter type-id='type-id-8' name='errnum'/>
+      <parameter type-id='type-id-10' name='errnum'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-418' name='buflen'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1119'>
-      <parameter type-id='type-id-8' name='af'/>
+      <parameter type-id='type-id-10' name='af'/>
       <parameter type-id='type-id-2' name='src'/>
       <parameter type-id='type-id-1' name='dst'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1120'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1121'>
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <parameter type-id='type-id-42' name='status'/>
-      <parameter type-id='type-id-8' name='options'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='options'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1122'>
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <parameter type-id='type-id-42' name='status'/>
-      <parameter type-id='type-id-8' name='options'/>
+      <parameter type-id='type-id-10' name='options'/>
       <parameter type-id='type-id-1' name='rusage'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1123'>
-      <parameter type-id='type-id-8' name='domain'/>
-      <parameter type-id='type-id-8' name='type'/>
-      <parameter type-id='type-id-8' name='protocol'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='domain'/>
+      <parameter type-id='type-id-10' name='type'/>
+      <parameter type-id='type-id-10' name='protocol'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1124'>
-      <parameter type-id='type-id-8' name='domain'/>
-      <parameter type-id='type-id-8' name='type'/>
-      <parameter type-id='type-id-8' name='protocol'/>
+      <parameter type-id='type-id-10' name='domain'/>
+      <parameter type-id='type-id-10' name='type'/>
+      <parameter type-id='type-id-10' name='protocol'/>
       <parameter type-id='type-id-42' name='fd'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1125'>
-      <parameter type-id='type-id-8' name='epfd'/>
-      <parameter type-id='type-id-8' name='op'/>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='epfd'/>
+      <parameter type-id='type-id-10' name='op'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='ev'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1126'>
-      <parameter type-id='type-id-8' name='sockfd'/>
-      <parameter type-id='type-id-8' name='level'/>
-      <parameter type-id='type-id-8' name='optname'/>
+      <parameter type-id='type-id-10' name='sockfd'/>
+      <parameter type-id='type-id-10' name='level'/>
+      <parameter type-id='type-id-10' name='optname'/>
       <parameter type-id='type-id-1' name='optval'/>
       <parameter type-id='type-id-42' name='optlen'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1127'>
-      <parameter type-id='type-id-8' name='shmid'/>
-      <parameter type-id='type-id-8' name='cmd'/>
+      <parameter type-id='type-id-10' name='shmid'/>
+      <parameter type-id='type-id-10' name='cmd'/>
       <parameter type-id='type-id-1' name='buf'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1128'>
-      <parameter type-id='type-id-8' name='idtype'/>
-      <parameter type-id='type-id-8' name='id'/>
+      <parameter type-id='type-id-10' name='idtype'/>
+      <parameter type-id='type-id-10' name='id'/>
       <parameter type-id='type-id-1' name='infop'/>
-      <parameter type-id='type-id-8' name='options'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='options'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1129'>
-      <parameter type-id='type-id-8' name='sig'/>
+      <parameter type-id='type-id-10' name='sig'/>
       <parameter type-id='type-id-1186' name='act'/>
       <parameter type-id='type-id-1186' name='old'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1130'>
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <parameter type-id='type-id-418' name='cpusetsize'/>
       <parameter type-id='type-id-1' name='mask'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1131'>
-      <parameter type-id='type-id-8' name='d'/>
+      <parameter type-id='type-id-10' name='d'/>
       <parameter type-id='type-id-149' name='request'/>
       <parameter type-id='type-id-1' name='arg'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1132'>
-      <parameter type-id='type-id-8' name='option'/>
+      <parameter type-id='type-id-10' name='option'/>
       <parameter type-id='type-id-33' name='arg2'/>
       <parameter type-id='type-id-33' name='arg3'/>
       <parameter type-id='type-id-33' name='arg4'/>
       <parameter type-id='type-id-33' name='arg5'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1133'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='buf'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1134'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='mask'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1135'>
-      <parameter type-id='type-id-8' name='sock_fd'/>
+      <parameter type-id='type-id-10' name='sock_fd'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-42' name='addrlen'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1136'>
-      <parameter type-id='type-id-8' name='epfd'/>
+      <parameter type-id='type-id-10' name='epfd'/>
       <parameter type-id='type-id-1' name='ev'/>
-      <parameter type-id='type-id-8' name='cnt'/>
-      <parameter type-id='type-id-8' name='timeout'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='cnt'/>
+      <parameter type-id='type-id-10' name='timeout'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1137'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-149' name='addrlen'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1138'>
-      <parameter type-id='type-id-8' name='sockfd'/>
+      <parameter type-id='type-id-10' name='sockfd'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-155' name='addrlen'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1139'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-155' name='addrlen'/>
-      <parameter type-id='type-id-8' name='f'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='f'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1140'>
-      <parameter type-id='type-id-8' name='which'/>
+      <parameter type-id='type-id-10' name='which'/>
       <parameter type-id='type-id-1' name='new_value'/>
       <parameter type-id='type-id-1' name='old_value'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1141'>
       <parameter type-id='type-id-196' name='clk_id'/>
       <parameter type-id='type-id-1' name='tp'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1142'>
       <parameter type-id='type-id-99' name='thread'/>
       <parameter type-id='type-id-2' name='name'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1143'>
       <parameter type-id='type-id-99' name='thread'/>
       <parameter type-id='type-id-42' name='policy'/>
       <parameter type-id='type-id-42' name='param'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1144'>
       <parameter type-id='type-id-438' name='usec'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1145'>
       <parameter type-id='type-id-149' name='initval'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1146'>
       <parameter type-id='type-id-125' name='f'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1147'>
       <parameter type-id='type-id-1221' name='f'/>
       <parameter type-id='type-id-1' name='arg'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1148'>
       <parameter type-id='type-id-470' name='f'/>
       <parameter type-id='type-id-1' name='arg'/>
       <parameter type-id='type-id-1' name='dso'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-206'>
       <parameter type-id='type-id-1' name='env'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1149'>
       <parameter type-id='type-id-232' name='buffer'/>
-      <parameter type-id='type-id-8' name='size'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='size'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1150'>
       <parameter type-id='type-id-232' name='memptr'/>
       <parameter type-id='type-id-99' name='align'/>
       <parameter type-id='type-id-99' name='sz'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1151'>
       <parameter type-id='type-id-1' name='dirp'/>
       <parameter type-id='type-id-965' name='entry'/>
       <parameter type-id='type-id-967' name='result'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1152'>
       <parameter type-id='type-id-1' name='dirp'/>
       <parameter type-id='type-id-970' name='entry'/>
       <parameter type-id='type-id-972' name='result'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1153'>
       <parameter type-id='type-id-1' name='buf'/>
       <parameter type-id='type-id-1011' name='result'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1154'>
       <parameter type-id='type-id-1' name='stream'/>
       <parameter type-id='type-id-2' name='format'/>
       <parameter type-id='type-id-245' name='ap'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1155'>
       <parameter type-id='type-id-1' name='stream'/>
       <parameter type-id='type-id-2' name='format'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1156'>
       <parameter type-id='type-id-1' name='buffer'/>
       <parameter type-id='type-id-1072' name='result'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1157'>
       <parameter type-id='type-id-1' name='tid'/>
-      <parameter type-id='type-id-8' name='sig'/>
-      <return type-id='type-id-8'/>
+      <parameter type-id='type-id-10' name='sig'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1158'>
       <parameter type-id='type-id-1' name='s'/>
       <parameter type-id='type-id-42' name='sval'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1159'>
       <parameter type-id='type-id-1' name='addr'/>
-      <parameter type-id='type-id-8' name='len'/>
-      <parameter type-id='type-id-8' name='type'/>
+      <parameter type-id='type-id-10' name='len'/>
+      <parameter type-id='type-id-10' name='type'/>
       <parameter type-id='type-id-979' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-418' name='buflen'/>
       <parameter type-id='type-id-984' name='result'/>
       <parameter type-id='type-id-42' name='h_errnop'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1160'>
       <parameter type-id='type-id-1' name='s'/>
-      <parameter type-id='type-id-8' name='pshared'/>
+      <parameter type-id='type-id-10' name='pshared'/>
       <parameter type-id='type-id-149' name='value'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1161'>
       <parameter type-id='type-id-1' name='buffer'/>
       <parameter type-id='type-id-1181' name='result'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1162'>
       <parameter type-id='type-id-1' name='attr'/>
       <parameter type-id='type-id-418' name='cpusetsize'/>
       <parameter type-id='type-id-1' name='cpuset'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-99' name='len'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1164'>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-438' name='sz'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1165'>
       <parameter type-id='type-id-1' name='o'/>
       <parameter type-id='type-id-125' name='f'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-31'>
       <parameter type-id='type-id-1' name='attr'/>
       <parameter type-id='type-id-1' name='r'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1166'>
       <parameter type-id='type-id-1' name='th'/>
       <parameter type-id='type-id-232' name='ret'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-1' name='attr'/>
       <parameter type-id='type-id-232' name='addr'/>
       <parameter type-id='type-id-935' name='size'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-1' name='s1'/>
       <parameter type-id='type-id-1' name='s2'/>
       <parameter type-id='type-id-99' name='n'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1169'>
       <parameter type-id='type-id-1' name='b'/>
       <parameter type-id='type-id-1' name='a'/>
       <parameter type-id='type-id-149' name='count'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1170'>
       <parameter type-id='type-id-1' name='th'/>
       <parameter type-id='type-id-1' name='attr'/>
       <parameter type-id='type-id-1232' name='callback'/>
       <parameter type-id='type-id-1' name='param'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1171'>
       <parameter type-id='type-id-1' name='c'/>
       <parameter type-id='type-id-1' name='m'/>
       <parameter type-id='type-id-1' name='abstime'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-1' name='node'/>
       <parameter type-id='type-id-1' name='service'/>
       <parameter type-id='type-id-1' name='hints'/>
       <parameter type-id='type-id-1' name='rv'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1176'>
       <parameter type-id='type-id-381' name='x'/>
@@ -15216,7 +15223,7 @@
     <function-type size-in-bits='64' id='type-id-1187'>
       <parameter type-id='type-id-2' name='nptr'/>
       <parameter type-id='type-id-130' name='endptr'/>
-      <parameter type-id='type-id-8' name='base'/>
+      <parameter type-id='type-id-10' name='base'/>
       <return type-id='type-id-429'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1188'>
@@ -15241,7 +15248,7 @@
       <return type-id='type-id-418'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1191'>
-      <parameter type-id='type-id-8' name='name'/>
+      <parameter type-id='type-id-10' name='name'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-418' name='len'/>
       <return type-id='type-id-418'/>
@@ -15278,7 +15285,7 @@
     <function-type size-in-bits='64' id='type-id-1196'>
       <parameter type-id='type-id-130' name='lineptr'/>
       <parameter type-id='type-id-935' name='n'/>
-      <parameter type-id='type-id-8' name='delim'/>
+      <parameter type-id='type-id-10' name='delim'/>
       <parameter type-id='type-id-1' name='stream'/>
       <return type-id='type-id-420'/>
     </function-type>
@@ -15289,53 +15296,53 @@
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1198'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-991' name='iov'/>
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1199'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-991' name='iov'/>
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <parameter type-id='type-id-431' name='offset'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1200'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-991' name='iov'/>
-      <parameter type-id='type-id-8' name='iovcnt'/>
+      <parameter type-id='type-id-10' name='iovcnt'/>
       <parameter type-id='type-id-432' name='offset'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1201'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-997' name='msg'/>
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1202'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-431' name='count'/>
       <parameter type-id='type-id-431' name='offset'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1203'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-418' name='count'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1204'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-418' name='count'/>
       <parameter type-id='type-id-431' name='offset'/>
       <return type-id='type-id-420'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1205'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='ptr'/>
       <parameter type-id='type-id-418' name='count'/>
       <parameter type-id='type-id-432' name='offset'/>
@@ -15350,8 +15357,8 @@
       <return type-id='type-id-99'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1208'>
-      <parameter type-id='type-id-8' name='request'/>
-      <parameter type-id='type-id-8' name='pid'/>
+      <parameter type-id='type-id-10' name='request'/>
+      <parameter type-id='type-id-10' name='pid'/>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-1' name='data'/>
       <return type-id='type-id-99'/>
@@ -15368,20 +15375,20 @@
       <return type-id='type-id-99'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1211'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='msg'/>
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-438'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1212'>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-1' name='buf'/>
       <parameter type-id='type-id-438' name='len'/>
-      <parameter type-id='type-id-8' name='flags'/>
+      <parameter type-id='type-id-10' name='flags'/>
       <return type-id='type-id-438'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1213'>
-      <parameter type-id='type-id-8' name='sig'/>
+      <parameter type-id='type-id-10' name='sig'/>
       <parameter type-id='type-id-435' name='h'/>
       <return type-id='type-id-435'/>
     </function-type>
@@ -15395,7 +15402,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1216'>
       <parameter type-id='type-id-131' name='env'/>
-      <parameter type-id='type-id-8' name='val'/>
+      <parameter type-id='type-id-10' name='val'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1217'>
@@ -15411,17 +15418,17 @@
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-210'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1219'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-1182'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1220'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-4'/>
     </function-type>
@@ -15453,13 +15460,13 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1227'>
       <parameter type-id='type-id-28' name='s'/>
-      <parameter type-id='type-id-8' name='c'/>
+      <parameter type-id='type-id-10' name='c'/>
       <parameter type-id='type-id-99' name='n'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1228'>
       <parameter type-id='type-id-2' name='filename'/>
-      <parameter type-id='type-id-8' name='flag'/>
+      <parameter type-id='type-id-10' name='flag'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1229'>
@@ -15477,7 +15484,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1233'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-1'/>
     </function-type>
@@ -15489,18 +15496,18 @@
     <function-type size-in-bits='64' id='type-id-1235'>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-438' name='sz'/>
-      <parameter type-id='type-id-8' name='prot'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='prot'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-198' name='off'/>
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1236'>
       <parameter type-id='type-id-1' name='addr'/>
       <parameter type-id='type-id-438' name='sz'/>
-      <parameter type-id='type-id-8' name='prot'/>
-      <parameter type-id='type-id-8' name='flags'/>
-      <parameter type-id='type-id-8' name='fd'/>
+      <parameter type-id='type-id-10' name='prot'/>
+      <parameter type-id='type-id-10' name='flags'/>
+      <parameter type-id='type-id-10' name='fd'/>
       <parameter type-id='type-id-149' name='off'/>
       <return type-id='type-id-1'/>
     </function-type>
@@ -16022,10 +16029,10 @@
           <var-decl name='report_mtx' type-id='type-id-406' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
-          <var-decl name='nreported' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+          <var-decl name='nreported' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516832'>
-          <var-decl name='nmissed_expected' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+          <var-decl name='nmissed_expected' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516864'>
           <var-decl name='last_symbolize_time_ns' type-id='type-id-356' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
@@ -16071,13 +16078,13 @@
     <namespace-decl name='__tsan'>
       <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-1256'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='in_blocking_func' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+          <var-decl name='in_blocking_func' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='int_signal_send' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+          <var-decl name='int_signal_send' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='pending_signal_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+          <var-decl name='pending_signal_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='pending_signals' type-id='type-id-371' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
@@ -16093,10 +16100,10 @@
           <var-decl name='fast_synch_epoch' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='410' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='ignore_reads_and_writes' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
+          <var-decl name='ignore_reads_and_writes' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
-          <var-decl name='ignore_sync' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
+          <var-decl name='ignore_sync' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='mop_ignore_set' type-id='type-id-1279' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='418' column='1'/>
@@ -16144,7 +16151,7 @@
           <var-decl name='unique_id' type-id='type-id-233' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='437' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398720'>
-          <var-decl name='in_rtl' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
+          <var-decl name='in_rtl' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398752'>
           <var-decl name='in_symbolizer' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='439' column='1'/>
@@ -16192,14 +16199,14 @@
           <var-decl name='last_sleep_clock' type-id='type-id-337' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='457' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3448768'>
-          <var-decl name='nomalloc' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
+          <var-decl name='nomalloc' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadState' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-399' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-198'/>
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-99'/>
@@ -16212,8 +16219,8 @@
           <function-decl name='ThreadState' mangled-name='_ZN6__tsan11ThreadStateC2EPNS_7ContextEiiymmmm' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-399' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-198'/>
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-99'/>
@@ -16249,7 +16256,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1291' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16452,14 +16459,14 @@
         <member-function access='public'>
           <function-decl name='SetHistorySize' mangled-name='_ZN6__tsan9FastState14SetHistorySizeEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1300' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='GetHistorySize' mangled-name='_ZNK6__tsan9FastState14GetHistorySizeEv' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1301' is-artificial='yes'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16538,7 +16545,7 @@
               <var-decl name='epoch' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='26' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
+              <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='160'>
               <var-decl name='write' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='28' column='1'/>
@@ -16630,7 +16637,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedReport' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16683,7 +16690,7 @@
         <member-function access='public'>
           <function-decl name='SetCount' mangled-name='_ZN6__tsan12ScopedReport8SetCountEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16724,7 +16731,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedReport' mangled-name='_ZN6__tsan12ScopedReportD2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16758,7 +16765,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~StackTrace' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1318' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16847,7 +16854,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~StackTrace' mangled-name='_ZN6__tsan10StackTraceD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1318' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16898,7 +16905,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -16949,7 +16956,7 @@
           <function-decl name='PartIdx' mangled-name='_ZN6__tsan7SyncTab7PartIdxEm' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16986,7 +16993,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -17016,7 +17023,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1327' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -17113,7 +17120,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -17210,7 +17217,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1341' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -17731,28 +17738,28 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadContext' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='23' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContext' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadContext' mangled-name='_ZN6__tsan13ThreadContextC2Ei' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='23' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContext' mangled-name='_ZN6__tsan13ThreadContextD2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -18139,7 +18146,7 @@
           <var-decl name='detached' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='44' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='reuse_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
+          <var-decl name='reuse_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='928'>
           <var-decl name='parent_tid' type-id='type-id-196' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='47' column='1'/>
@@ -18157,7 +18164,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContextBase' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -18222,7 +18229,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContextBase' mangled-name='_ZN11__sanitizer17ThreadContextBaseD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -18291,7 +18298,7 @@
           <var-decl name='sleep' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='102' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1408'>
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ReportDesc' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18302,7 +18309,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ReportDesc' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1309' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -18329,7 +18336,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ReportDesc' mangled-name='_ZN6__tsan10ReportDescD2Ev' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1309' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -18509,13 +18516,13 @@
           <var-decl name='creation_stack_id' type-id='type-id-196' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='736'>
-          <var-decl name='owner_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
+          <var-decl name='owner_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <var-decl name='last_lock' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='832'>
-          <var-decl name='recursion' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
+          <var-decl name='recursion' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
           <var-decl name='is_rw' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='64' column='1'/>
@@ -19069,7 +19076,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19166,7 +19173,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1463' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19263,7 +19270,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19360,7 +19367,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1477' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19457,7 +19464,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1483' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19864,10 +19871,10 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='35' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
-          <var-decl name='col' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
+          <var-decl name='col' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -19916,10 +19923,10 @@
           <var-decl name='offset' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='70' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='352'>
-          <var-decl name='fd' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
+          <var-decl name='fd' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='73' column='1'/>
@@ -19928,7 +19935,7 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='stack' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='76' column='1'/>
@@ -19938,13 +19945,13 @@
     <namespace-decl name='__tsan'>
       <class-decl name='ReportMop' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='45' column='1' id='type-id-1495'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='addr' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
+          <var-decl name='size' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <var-decl name='write' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='49' column='1'/>
@@ -19988,7 +19995,7 @@
     <namespace-decl name='__tsan'>
       <class-decl name='ReportThread' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='79' column='1' id='type-id-1500'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='id' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
+          <var-decl name='id' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='pid' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='81' column='1'/>
@@ -20000,7 +20007,7 @@
           <var-decl name='name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='83' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='parent_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
+          <var-decl name='parent_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='stack' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='85' column='1'/>
@@ -20032,7 +20039,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1530' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20160,14 +20167,14 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='MemoryWrite' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='Initialize' mangled-name='_ZN6__tsan10InitializeEPNS_11ThreadStateE' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='640' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20178,7 +20185,7 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-124'/>
         <parameter type-id='type-id-124'/>
         <return type-id='type-id-4'/>
@@ -20261,7 +20268,7 @@
       <function-decl name='internal_strcmp' mangled-name='_ZN11__sanitizer15internal_strcmpEPKcS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
         <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
@@ -20290,10 +20297,10 @@
           <var-decl name='prev' type-id='type-id-1555' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='68' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='hitcount' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='69' column='1'/>
+          <var-decl name='hitcount' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
-          <var-decl name='addcount' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='70' column='1'/>
+          <var-decl name='addcount' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='70' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='addr' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='71' column='1'/>
@@ -20305,7 +20312,7 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='73' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='74' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
           <var-decl name='desc' type-id='type-id-1550' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='75' column='1'/>
@@ -20334,7 +20341,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1559' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20419,7 +20426,7 @@
             <parameter type-id='type-id-399'/>
             <parameter type-id='type-id-2'/>
             <parameter type-id='type-id-2'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-99'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20427,7 +20434,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedAnnotation' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20440,148 +20447,148 @@
     </namespace-decl>
     <function-decl name='AnnotateHappensBefore' mangled-name='AnnotateHappensBefore' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateHappensBefore'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateHappensAfter' mangled-name='AnnotateHappensAfter' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateHappensAfter'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateCondVarSignal' mangled-name='AnnotateCondVarSignal' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateCondVarSignal'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateCondVarSignalAll' mangled-name='AnnotateCondVarSignalAll' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateCondVarSignalAll'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateMutexIsNotPHB' mangled-name='AnnotateMutexIsNotPHB' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateMutexIsNotPHB'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateCondVarWait' mangled-name='AnnotateCondVarWait' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateCondVarWait'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateRWLockCreate' mangled-name='AnnotateRWLockCreate' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateRWLockCreate'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateRWLockCreateStatic' mangled-name='AnnotateRWLockCreateStatic' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateRWLockCreateStatic'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateRWLockDestroy' mangled-name='AnnotateRWLockDestroy' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateRWLockDestroy'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateRWLockAcquired' mangled-name='AnnotateRWLockAcquired' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateRWLockAcquired'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateRWLockReleased' mangled-name='AnnotateRWLockReleased' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateRWLockReleased'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateTraceMemory' mangled-name='AnnotateTraceMemory' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateTraceMemory'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateFlushState' mangled-name='AnnotateFlushState' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateFlushState'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateNewMemory' mangled-name='AnnotateNewMemory' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateNewMemory'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateNoOp' mangled-name='AnnotateNoOp' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateNoOp'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateFlushExpectedRaces' mangled-name='AnnotateFlushExpectedRaces' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='306' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateFlushExpectedRaces'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateEnableRaceDetection' mangled-name='AnnotateEnableRaceDetection' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateEnableRaceDetection'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
-      <parameter type-id='type-id-8' name='enable' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
+      <parameter type-id='type-id-10' name='enable' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='322' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateMutexIsUsedAsCondVar' mangled-name='AnnotateMutexIsUsedAsCondVar' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateMutexIsUsedAsCondVar'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotatePCQGet' mangled-name='AnnotatePCQGet' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotatePCQGet'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotatePCQPut' mangled-name='AnnotatePCQPut' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotatePCQPut'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotatePCQDestroy' mangled-name='AnnotatePCQDestroy' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotatePCQDestroy'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotatePCQCreate' mangled-name='AnnotatePCQCreate' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotatePCQCreate'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateExpectRace' mangled-name='AnnotateExpectRace' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateExpectRace'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <parameter type-id='type-id-28' name='desc' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateBenignRaceSized' mangled-name='AnnotateBenignRaceSized' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateBenignRaceSized'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-28' name='desc' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
@@ -20589,83 +20596,83 @@
     </function-decl>
     <function-decl name='AnnotateBenignRace' mangled-name='AnnotateBenignRace' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateBenignRace'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <parameter type-id='type-id-28' name='desc' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='353' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreReadsBegin' mangled-name='AnnotateIgnoreReadsBegin' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreReadsBegin'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreReadsEnd' mangled-name='AnnotateIgnoreReadsEnd' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreReadsEnd'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreWritesBegin' mangled-name='AnnotateIgnoreWritesBegin' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreWritesBegin'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreWritesEnd' mangled-name='AnnotateIgnoreWritesEnd' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreWritesEnd'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreSyncBegin' mangled-name='AnnotateIgnoreSyncBegin' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreSyncBegin'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateIgnoreSyncEnd' mangled-name='AnnotateIgnoreSyncEnd' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='407' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateIgnoreSyncEnd'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='293' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotatePublishMemoryRange' mangled-name='AnnotatePublishMemoryRange' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotatePublishMemoryRange'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateUnpublishMemoryRange' mangled-name='AnnotateUnpublishMemoryRange' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateUnpublishMemoryRange'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='AnnotateThreadName' mangled-name='AnnotateThreadName' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateThreadName'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='423' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='WTFAnnotateHappensBefore' mangled-name='WTFAnnotateHappensBefore' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='WTFAnnotateHappensBefore'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='WTFAnnotateHappensAfter' mangled-name='WTFAnnotateHappensAfter' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='WTFAnnotateHappensAfter'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <parameter type-id='type-id-99' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='229' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='WTFAnnotateBenignRaceSized' mangled-name='WTFAnnotateBenignRaceSized' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='WTFAnnotateBenignRaceSized'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-99' name='mem' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <parameter type-id='type-id-28' name='desc' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='371' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='ValgrindSlowdown' mangled-name='ValgrindSlowdown' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ValgrindSlowdown'>
       <return type-id='type-id-376'/>
@@ -20676,7 +20683,7 @@
     </function-decl>
     <function-decl name='AnnotateMemoryIsInitialized' mangled-name='AnnotateMemoryIsInitialized' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='AnnotateMemoryIsInitialized'>
       <parameter type-id='type-id-28' name='f' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
-      <parameter type-id='type-id-8' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
+      <parameter type-id='type-id-10' name='l' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='cv' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='251' column='1'/>
       <parameter type-id='type-id-99' name='lock' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='252' column='1'/>
       <return type-id='type-id-4'/>
@@ -20765,7 +20772,7 @@
       <member-function access='public' destructor='yes'>
         <function-decl name='~ScopedAtomic' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1567' is-artificial='yes'/>
-          <parameter type-id='type-id-8' is-artificial='yes'/>
+          <parameter type-id='type-id-10' is-artificial='yes'/>
           <return type-id='type-id-4'/>
         </function-decl>
       </member-function>
@@ -20786,7 +20793,7 @@
     <typedef-decl name='a16' type-id='type-id-1574' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='42' column='1' id='type-id-1575'/>
     <typedef-decl name='__tsan_atomic16' type-id='type-id-77' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='23' column='1' id='type-id-1574'/>
     <typedef-decl name='a32' type-id='type-id-1576' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='43' column='1' id='type-id-1577'/>
-    <typedef-decl name='__tsan_atomic32' type-id='type-id-8' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='24' column='1' id='type-id-1576'/>
+    <typedef-decl name='__tsan_atomic32' type-id='type-id-10' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='24' column='1' id='type-id-1576'/>
     <typedef-decl name='a64' type-id='type-id-1578' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='44' column='1' id='type-id-1579'/>
     <typedef-decl name='__tsan_atomic64' type-id='type-id-45' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.h' line='25' column='1' id='type-id-1578'/>
     <typedef-decl name='a128' type-id='type-id-1580' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='45' column='1' id='type-id-1581'/>
@@ -20910,7 +20917,7 @@
     <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-1342'/>
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-3'/>
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-2'/>
-    <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'/>
     <qualified-type-def type-id='type-id-1587' const='yes' id='type-id-1588'/>
     <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-1589'/>
     <qualified-type-def type-id='type-id-1590' const='yes' id='type-id-1591'/>
@@ -20960,13 +20967,13 @@
           <var-decl name='handle_ioctl' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='224'>
-          <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'>
           <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <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'>
           <var-decl name='detect_leaks' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
@@ -21012,7 +21019,7 @@
           <var-decl name='detached' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='44' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='reuse_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
+          <var-decl name='reuse_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='45' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='928'>
           <var-decl name='parent_tid' type-id='type-id-196' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='47' column='1'/>
@@ -21030,7 +21037,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContextBase' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -21095,7 +21102,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContextBase' mangled-name='_ZN11__sanitizer17ThreadContextBaseD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -22186,7 +22193,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1291' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -22715,7 +22722,7 @@
       </enum-decl>
       <function-decl name='CheckFailed' mangled-name='_ZN11__sanitizer11CheckFailedEPKciS1_yy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__sanitizer11CheckFailedEPKciS1_yy'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-198'/>
         <parameter type-id='type-id-198'/>
@@ -22782,7 +22789,7 @@
               <var-decl name='epoch' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='26' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
+              <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='27' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='160'>
               <var-decl name='write' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='28' column='1'/>
@@ -22909,25 +22916,25 @@
           <var-decl name='print_benign' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='608'>
-          <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'>
           <var-decl name='halt_on_error' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='672'>
-          <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'>
           <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
-          <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'>
-          <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'>
-          <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'>
           <var-decl name='stop_on_start' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
@@ -22936,10 +22943,10 @@
           <var-decl name='running_on_valgrind' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <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'>
-          <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>
       <class-decl name='DeadlockDetector' size-in-bits='768' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='66' column='1' id='type-id-1287'>
@@ -22999,13 +23006,13 @@
           <var-decl name='creation_stack_id' type-id='type-id-196' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='736'>
-          <var-decl name='owner_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
+          <var-decl name='owner_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
           <var-decl name='last_lock' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='832'>
-          <var-decl name='recursion' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
+          <var-decl name='recursion' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
           <var-decl name='is_rw' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='64' column='1'/>
@@ -23073,10 +23080,10 @@
           <var-decl name='fast_synch_epoch' type-id='type-id-198' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='410' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='ignore_reads_and_writes' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
+          <var-decl name='ignore_reads_and_writes' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
-          <var-decl name='ignore_sync' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
+          <var-decl name='ignore_sync' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='415' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='mop_ignore_set' type-id='type-id-1279' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='418' column='1'/>
@@ -23124,7 +23131,7 @@
           <var-decl name='unique_id' type-id='type-id-233' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='437' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398720'>
-          <var-decl name='in_rtl' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
+          <var-decl name='in_rtl' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='438' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2398752'>
           <var-decl name='in_symbolizer' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='439' column='1'/>
@@ -23172,14 +23179,14 @@
           <var-decl name='last_sleep_clock' type-id='type-id-337' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='457' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3448768'>
-          <var-decl name='nomalloc' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
+          <var-decl name='nomalloc' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='462' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadState' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-399' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-198'/>
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-99'/>
@@ -23192,8 +23199,8 @@
           <function-decl name='ThreadState' mangled-name='_ZN6__tsan11ThreadStateC2EPNS_7ContextEiiymmmm' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='464' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-399' is-artificial='yes'/>
             <parameter type-id='type-id-1251'/>
-            <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-198'/>
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-99'/>
@@ -23286,14 +23293,14 @@
         <member-function access='public'>
           <function-decl name='SetHistorySize' mangled-name='_ZN6__tsan9FastState14SetHistorySizeEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1300' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='GetHistorySize' mangled-name='_ZNK6__tsan9FastState14GetHistorySizeEv' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1301' is-artificial='yes'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23353,7 +23360,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23404,7 +23411,7 @@
           <function-decl name='PartIdx' mangled-name='_ZN6__tsan7SyncTab7PartIdxEm' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -23441,7 +23448,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23461,7 +23468,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1258' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23520,7 +23527,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1258' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23536,10 +23543,10 @@
           <var-decl name='report_mtx' type-id='type-id-406' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
-          <var-decl name='nreported' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+          <var-decl name='nreported' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516832'>
-          <var-decl name='nmissed_expected' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+          <var-decl name='nmissed_expected' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516864'>
           <var-decl name='last_symbolize_time_ns' type-id='type-id-356' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
@@ -23604,7 +23611,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1341' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23699,7 +23706,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23791,28 +23798,28 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadContext' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='23' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContext' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadContext' mangled-name='_ZN6__tsan13ThreadContextC2Ei' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='23' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ThreadContext' mangled-name='_ZN6__tsan13ThreadContextD2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1286' is-artificial='yes'/>
-            <parameter type-id='type-id-8'/>
+            <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23879,7 +23886,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1327' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -23953,13 +23960,13 @@
       </class-decl>
       <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-1256'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='in_blocking_func' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+          <var-decl name='in_blocking_func' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='int_signal_send' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+          <var-decl name='int_signal_send' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='pending_signal_count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+          <var-decl name='pending_signal_count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='pending_signals' type-id='type-id-371' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
@@ -24494,11 +24501,11 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='GetThreadTrace' filepath='../../.././libsanitizer/tsan/tsan_platform.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='TraceAddEvent' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24512,7 +24519,7 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='cur_thread' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24522,7 +24529,7 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-124'/>
         <parameter type-id='type-id-124'/>
         <return type-id='type-id-4'/>
@@ -24836,7 +24843,7 @@
       <parameter type-id='type-id-1573' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='591' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic16_compare_exchange_strong' mangled-name='__tsan_atomic16_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic16_compare_exchange_strong'>
       <parameter type-id='type-id-1605' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1'/>
@@ -24844,7 +24851,7 @@
       <parameter type-id='type-id-1575' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic32_compare_exchange_strong' mangled-name='__tsan_atomic32_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic32_compare_exchange_strong'>
       <parameter type-id='type-id-1606' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1'/>
@@ -24852,7 +24859,7 @@
       <parameter type-id='type-id-1577' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic64_compare_exchange_strong' mangled-name='__tsan_atomic64_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic64_compare_exchange_strong'>
       <parameter type-id='type-id-1607' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1'/>
@@ -24860,7 +24867,7 @@
       <parameter type-id='type-id-1579' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic128_compare_exchange_strong' mangled-name='__tsan_atomic128_compare_exchange_strong' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic128_compare_exchange_strong'>
       <parameter type-id='type-id-1604' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1'/>
@@ -24868,7 +24875,7 @@
       <parameter type-id='type-id-1581' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic8_compare_exchange_weak' mangled-name='__tsan_atomic8_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic8_compare_exchange_weak'>
       <parameter type-id='type-id-1608' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='591' column='1'/>
@@ -24876,7 +24883,7 @@
       <parameter type-id='type-id-1573' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='591' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='592' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic16_compare_exchange_weak' mangled-name='__tsan_atomic16_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic16_compare_exchange_weak'>
       <parameter type-id='type-id-1605' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1'/>
@@ -24884,7 +24891,7 @@
       <parameter type-id='type-id-1575' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='596' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='597' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic32_compare_exchange_weak' mangled-name='__tsan_atomic32_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic32_compare_exchange_weak'>
       <parameter type-id='type-id-1606' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1'/>
@@ -24892,7 +24899,7 @@
       <parameter type-id='type-id-1577' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='601' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='602' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic64_compare_exchange_weak' mangled-name='__tsan_atomic64_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic64_compare_exchange_weak'>
       <parameter type-id='type-id-1607' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1'/>
@@ -24900,7 +24907,7 @@
       <parameter type-id='type-id-1579' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='606' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='607' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic128_compare_exchange_weak' mangled-name='__tsan_atomic128_compare_exchange_weak' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic128_compare_exchange_weak'>
       <parameter type-id='type-id-1604' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1'/>
@@ -24908,7 +24915,7 @@
       <parameter type-id='type-id-1581' name='v' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='612' column='1'/>
       <parameter type-id='type-id-1569' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
       <parameter type-id='type-id-1569' name='fmo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='613' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_atomic8_compare_exchange_val' mangled-name='__tsan_atomic8_compare_exchange_val' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_atomic8_compare_exchange_val'>
       <parameter type-id='type-id-1608' name='a' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='645' column='1'/>
@@ -24999,7 +25006,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedJavaFunc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1616' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -25042,7 +25049,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~BlockDesc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1612' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -25054,7 +25061,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__tsan_java_fini' mangled-name='__tsan_java_fini' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_fini'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__tsan_java_alloc' mangled-name='__tsan_java_alloc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_alloc'>
       <parameter type-id='type-id-1610' name='heap_begin' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='165' column='1'/>
@@ -25090,12 +25097,12 @@
     </function-decl>
     <function-decl name='__tsan_java_mutex_lock_rec' mangled-name='__tsan_java_mutex_lock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_lock_rec'>
       <parameter type-id='type-id-1610' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
-      <parameter type-id='type-id-8' name='rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
+      <parameter type-id='type-id-10' name='rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='309' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__tsan_java_mutex_unlock_rec' mangled-name='__tsan_java_mutex_unlock_rec' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tsan_java_mutex_unlock_rec'>
       <parameter type-id='type-id-1610' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='321' column='1'/>
-      <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/tsan/tsan_md5.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'>
@@ -25222,7 +25229,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1634' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26023,7 +26030,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='proc_yield' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='atomic_load&lt;__sanitizer::atomic_uintptr_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26070,7 +26077,7 @@
     <namespace-decl name='__tsan'>
       <class-decl name='Backoff' size-in-bits='32' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='167' column='1' id='type-id-1662'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='iter_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='188' column='1'/>
+          <var-decl name='iter_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='188' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='kActiveSpinIters' type-id='type-id-233' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.cc' line='189' column='1'/>
@@ -26113,39 +26120,39 @@
         <var-decl name='rlim_max' type-id='type-id-241' visibility='default' filepath='/usr/include/bits/resource.h' line='140' column='1'/>
       </data-member>
     </class-decl>
-    <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-decl name='rlim_t' type-id='type-id-242' filepath='/usr/include/bits/resource.h' line='127' column='1' id='type-id-241'/>
     <typedef-decl name='__rlim_t' type-id='type-id-33' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-242'/>
     <class-decl name='mallinfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/malloc.h' line='94' column='1' id='type-id-1670'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arena' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
+        <var-decl name='arena' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='ordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
+        <var-decl name='ordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='smblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
+        <var-decl name='smblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='hblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
+        <var-decl name='hblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='hblkhd' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
+        <var-decl name='hblkhd' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='usmblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
+        <var-decl name='usmblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='fsmblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
+        <var-decl name='fsmblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='uordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
+        <var-decl name='uordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fordblks' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='103' column='1'/>
+        <var-decl name='fordblks' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='keepcost' type-id='type-id-8' visibility='default' filepath='/usr/include/malloc.h' line='104' column='1'/>
+        <var-decl name='keepcost' type-id='type-id-10' visibility='default' filepath='/usr/include/malloc.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-296'/>
@@ -26162,14 +26169,14 @@
     <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-293'/>
     <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-299'/>
     <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-300'/>
-    <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'/>
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1677'/>
     <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-295'/>
     <pointer-type-def type-id='type-id-1678' size-in-bits='64' id='type-id-1679'/>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='fill_profile_f' type-id='type-id-1679' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_procmaps.h' line='119' column='1' id='type-id-1680'/>
       <typedef-decl name='StopTheWorldCallback' type-id='type-id-295' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld.h' line='54' column='1' id='type-id-285'/>
-      <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'/>
       <class-decl name='InternalMmapVector&lt;int&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-291'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='data_' type-id='type-id-42' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
@@ -26190,7 +26197,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-296' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26290,7 +26297,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1672' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26351,7 +26358,7 @@
             <parameter type-id='type-id-99'/>
             <parameter type-id='type-id-131'/>
             <parameter type-id='type-id-131'/>
-            <return type-id='type-id-8'/>
+            <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -26427,10 +26434,10 @@
           <var-decl name='thr_' type-id='type-id-399' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='557' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='in_rtl_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='558' column='1'/>
+          <var-decl name='in_rtl_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='558' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='96'>
-          <var-decl name='errno_' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='559' column='1'/>
+          <var-decl name='errno_' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='559' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ScopedInRtl' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='554' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26441,7 +26448,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedInRtl' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26454,7 +26461,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedInRtl' mangled-name='_ZN6__tsan11ScopedInRtlD2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26501,20 +26508,20 @@
       <function-decl name='ExtractResolvFDs' mangled-name='_ZN6__tsan16ExtractResolvFDsEPvPii' filepath='../../.././libsanitizer/tsan/tsan_platform_linux.cc' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
         <parameter type-id='type-id-42'/>
-        <parameter type-id='type-id-8'/>
-        <return type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='ExtractRecvmsgFDs' mangled-name='_ZN6__tsan17ExtractRecvmsgFDsEPvPii' filepath='../../.././libsanitizer/tsan/tsan_platform_linux.cc' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
         <parameter type-id='type-id-42'/>
-        <parameter type-id='type-id-8'/>
-        <return type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <return type-id='type-id-10'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='getrlimit' filepath='/usr/include/sys/resource.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-240'/>
       <parameter type-id='type-id-1677'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='__libc_mallinfo' filepath='../../.././libsanitizer/tsan/tsan_platform_linux.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-1670'/>
@@ -26676,7 +26683,7 @@
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-2'/>
         <parameter is-variadic='yes'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='Printf' mangled-name='_ZN11__sanitizer6PrintfEPKcz' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
@@ -26689,7 +26696,7 @@
       <function-decl name='ReportErrorSummary' mangled-name='_ZN11__sanitizer18ReportErrorSummaryEPKcS1_iS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-2'/>
         <return type-id='type-id-4'/>
       </function-decl>
@@ -26718,10 +26725,10 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='35' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='36' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='416'>
-          <var-decl name='col' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
+          <var-decl name='col' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='37' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ReportDesc' size-in-bits='1472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='94' column='1' id='type-id-1354'>
@@ -26747,7 +26754,7 @@
           <var-decl name='sleep' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='102' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1408'>
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='103' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ReportDesc' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26758,7 +26765,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ReportDesc' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1309' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26785,7 +26792,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ReportDesc' mangled-name='_ZN6__tsan10ReportDescD2Ev' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1309' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -26807,10 +26814,10 @@
           <var-decl name='offset' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='70' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='71' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='352'>
-          <var-decl name='fd' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
+          <var-decl name='fd' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='73' column='1'/>
@@ -26819,7 +26826,7 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='74' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='line' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
+          <var-decl name='line' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='stack' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='76' column='1'/>
@@ -26827,13 +26834,13 @@
       </class-decl>
       <class-decl name='ReportMop' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='45' column='1' id='type-id-1495'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
+          <var-decl name='tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='addr' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='size' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
+          <var-decl name='size' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
           <var-decl name='write' type-id='type-id-124' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='49' column='1'/>
@@ -26899,7 +26906,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1483' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27005,7 +27012,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27079,7 +27086,7 @@
       </class-decl>
       <class-decl name='ReportThread' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='79' column='1' id='type-id-1500'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='id' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
+          <var-decl name='id' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='80' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='pid' type-id='type-id-99' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='81' column='1'/>
@@ -27091,7 +27098,7 @@
           <var-decl name='name' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='83' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='parent_tid' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
+          <var-decl name='parent_tid' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='84' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='stack' type-id='type-id-1421' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='85' column='1'/>
@@ -27120,7 +27127,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1463' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27296,7 +27303,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27391,7 +27398,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1477' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27486,7 +27493,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1530' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27560,7 +27567,7 @@
       </class-decl>
       <function-decl name='thread_name' filepath='../../.././libsanitizer/tsan/tsan_report.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-28'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-2'/>
       </function-decl>
       <function-decl name='PrintStack' mangled-name='_ZN6__tsan10PrintStackEPKNS_11ReportStackE' filepath='../../.././libsanitizer/tsan/tsan_report.cc' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27622,7 +27629,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1693' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27655,7 +27662,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1695' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27674,7 +27681,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <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'/>
       <typedef-decl name='CheckFailedCallbackType' type-id='type-id-1706' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='205' column='1' id='type-id-1708'/>
       <class-decl name='InternalScopedBuffer&lt;char&gt;' size-in-bits='128' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='67' column='1' id='type-id-127'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -27693,7 +27700,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -27785,7 +27792,7 @@
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='SleepForSeconds' mangled-name='_ZN11__sanitizer15SleepForSecondsEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='NanoTime' mangled-name='_ZN11__sanitizer8NanoTimeEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27796,7 +27803,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='SleepForMillis' mangled-name='_ZN11__sanitizer14SleepForMillisEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='StackDepotPut' mangled-name='_ZN11__sanitizer13StackDepotPutEPKmm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='22' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27812,7 +27819,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='GetThreadTraceHeader' filepath='../../.././libsanitizer/tsan/tsan_platform.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='StoreShadow' filepath='../../.././libsanitizer/tsan/tsan_rtl.cc' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27832,7 +27839,7 @@
       <function-decl name='MemoryAccessImpl' filepath='../../.././libsanitizer/tsan/tsan_rtl.cc' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-124'/>
         <parameter type-id='type-id-124'/>
         <parameter type-id='type-id-1280'/>
@@ -27855,7 +27862,7 @@
       </function-decl>
       <function-decl name='Finalize' mangled-name='_ZN6__tsan8FinalizeEPNS_11ThreadStateE' filepath='../../.././libsanitizer/tsan/tsan_rtl.cc' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='CurrentStackId' mangled-name='_ZN6__tsan14CurrentStackIdEPNS_11ThreadStateEm' filepath='../../.././libsanitizer/tsan/tsan_rtl.cc' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
@@ -28016,7 +28023,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1705'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-198'/>
       <parameter type-id='type-id-198'/>
@@ -28053,7 +28060,7 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='RestoreStack' mangled-name='_ZN6__tsan12RestoreStackEiyPNS_10StackTraceEPNS_8MutexSetE' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='588' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-198'/>
         <parameter type-id='type-id-1318'/>
         <parameter type-id='type-id-1307'/>
@@ -28094,7 +28101,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28149,7 +28156,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1710' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28195,7 +28202,7 @@
         <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
         <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
         <parameter type-id='type-id-99' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='97' column='1'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='internal_strstr' mangled-name='_ZN11__sanitizer15internal_strstrEPKcS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
@@ -28208,7 +28215,7 @@
         <return type-id='type-id-123'/>
       </function-decl>
       <function-decl name='internal__exit' mangled-name='_ZN11__sanitizer14internal__exitEi' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
     </namespace-decl>
@@ -28237,7 +28244,7 @@
       </function-decl>
       <function-decl name='TsanCheckFailed' mangled-name='_ZN6__tsan15TsanCheckFailedEPKciS1_yy' filepath='../../.././libsanitizer/tsan/tsan_rtl_report.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-2'/>
         <parameter type-id='type-id-198'/>
         <parameter type-id='type-id-198'/>
@@ -28318,7 +28325,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1724' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28382,7 +28389,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~StackTrace' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1318' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28471,7 +28478,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~StackTrace' mangled-name='_ZN6__tsan10StackTraceD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1318' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28663,7 +28670,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedReport' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28716,7 +28723,7 @@
         <member-function access='public'>
           <function-decl name='SetCount' mangled-name='_ZN6__tsan12ScopedReport8SetCountEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28757,7 +28764,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~ScopedReport' mangled-name='_ZN6__tsan12ScopedReportD2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1310' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28822,7 +28829,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1732' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -28899,7 +28906,7 @@
           <var-decl name='tctx' type-id='type-id-1286' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='141' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='count' type-id='type-id-8' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='142' column='1'/>
+          <var-decl name='count' type-id='type-id-10' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='142' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='StatSet' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -28919,18 +28926,18 @@
       </function-decl>
       <function-decl name='ThreadCount' mangled-name='_ZN6__tsan11ThreadCountEPNS_11ThreadStateE' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='ThreadCreate' mangled-name='_ZN6__tsan12ThreadCreateEPNS_11ThreadStateEmmb' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-124'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='ThreadStart' mangled-name='_ZN6__tsan11ThreadStartEPNS_11ThreadStateEim' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-99'/>
         <return type-id='type-id-4'/>
       </function-decl>
@@ -28942,18 +28949,18 @@
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
         <parameter type-id='type-id-99'/>
-        <return type-id='type-id-8'/>
+        <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='ThreadJoin' mangled-name='_ZN6__tsan10ThreadJoinEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='ThreadDetach' mangled-name='_ZN6__tsan12ThreadDetachEPNS_11ThreadStateEmi' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-399'/>
         <parameter type-id='type-id-99'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='ThreadSetName' mangled-name='_ZN6__tsan13ThreadSetNameEPNS_11ThreadStateEPKc' filepath='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -28973,7 +28980,7 @@
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='ThreadTrace' mangled-name='_ZN6__tsan11ThreadTraceEi' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-1729'/>
       </function-decl>
       <function-decl name='AllocatorThreadStart' mangled-name='_ZN6__tsan20AllocatorThreadStartEPNS_11ThreadStateE' filepath='../../.././libsanitizer/tsan/tsan_mman.h' line='21' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -29079,7 +29086,7 @@
     <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-333'/>
     <qualified-type-def type-id='type-id-1743' const='yes' id='type-id-1745'/>
     <reference-type-def kind='lvalue' type-id='type-id-1745' size-in-bits='64' id='type-id-1746'/>
-    <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'/>
     <namespace-decl name='__sanitizer'>
       <class-decl name='AddressInfo' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='26' column='1' id='type-id-329'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -29098,10 +29105,10 @@
           <var-decl name='file' type-id='type-id-28' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='31' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <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'>
-          <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'>
           <function-decl name='AddressInfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -29141,7 +29148,7 @@
             <member-function access='public' destructor='yes'>
               <function-decl name='~SymbolizerScope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-320' is-artificial='yes'/>
-                <parameter type-id='type-id-8' is-artificial='yes'/>
+                <parameter type-id='type-id-10' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -29155,7 +29162,7 @@
             <member-function access='public' destructor='yes'>
               <function-decl name='~SymbolizerScope' mangled-name='_ZN11__sanitizer10Symbolizer15SymbolizerScopeD2Ev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-320' is-artificial='yes'/>
-                <parameter type-id='type-id-8' is-artificial='yes'/>
+                <parameter type-id='type-id-10' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -29306,7 +29313,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalScopedBuffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1744' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -29366,7 +29373,7 @@
       </class-decl>
       <function-decl name='internal_memset' mangled-name='_ZN11__sanitizer15internal_memsetEPvim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <parameter type-id='type-id-99'/>
         <return type-id='type-id-1'/>
       </function-decl>
@@ -29436,12 +29443,12 @@
       <var-decl name='pc' type-id='type-id-99' mangled-name='_ZN6__tsan2pcE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='60' column='1'/>
       <var-decl name='func' type-id='type-id-28' mangled-name='_ZN6__tsan4funcE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='61' column='1'/>
       <var-decl name='file' type-id='type-id-28' mangled-name='_ZN6__tsan4fileE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='62' column='1'/>
-      <var-decl name='line' type-id='type-id-8' mangled-name='_ZN6__tsan4lineE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='63' column='1'/>
-      <var-decl name='col' type-id='type-id-8' mangled-name='_ZN6__tsan3colE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='64' column='1'/>
+      <var-decl name='line' type-id='type-id-10' mangled-name='_ZN6__tsan4lineE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='63' column='1'/>
+      <var-decl name='col' type-id='type-id-10' mangled-name='_ZN6__tsan3colE' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_symbolize.cc' line='64' column='1'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.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'>
-    <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'/>
     <class-decl name='dl_phdr_info' size-in-bits='512' is-struct='yes' visibility='default' filepath='/usr/include/link.h' line='138' column='1' id='type-id-1747'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dlpi_addr' type-id='type-id-162' visibility='default' filepath='/usr/include/link.h' line='140' column='1'/>
@@ -29462,7 +29469,7 @@
         <var-decl name='dlpi_subs' type-id='type-id-156' visibility='default' filepath='/usr/include/link.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='dlpi_tls_modid' type-id='type-id-15' visibility='default' filepath='/usr/include/link.h' line='157' column='1'/>
+        <var-decl name='dlpi_tls_modid' type-id='type-id-8' visibility='default' filepath='/usr/include/link.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='dlpi_tls_data' type-id='type-id-1' visibility='default' filepath='/usr/include/link.h' line='162' column='1'/>
@@ -29503,20 +29510,20 @@
     <typedef-decl name='Elf64_Xword' type-id='type-id-208' filepath='/usr/include/elf.h' line='45' column='1' id='type-id-168'/>
     <typedef-decl name='Elf64_Half' type-id='type-id-1755' filepath='/usr/include/elf.h' line='34' column='1' id='type-id-1749'/>
     <typedef-decl name='uint16_t' type-id='type-id-190' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-1755'/>
-    <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'/>
     <qualified-type-def type-id='type-id-1751' const='yes' id='type-id-1756'/>
     <pointer-type-def type-id='type-id-1756' size-in-bits='64' id='type-id-1748'/>
     <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-41'/>
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-39'/>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_dup2' mangled-name='_ZN11__sanitizer13internal_dup2Eii' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-8'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-99'/>
       </function-decl>
       <function-decl name='internal_strrchr' mangled-name='_ZN11__sanitizer16internal_strrchrEPKci' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-28'/>
       </function-decl>
     </namespace-decl>
@@ -29527,11 +29534,11 @@
       </function-decl>
     </namespace-decl>
     <function-decl name='getdtablesize' filepath='/usr/include/unistd.h' line='997' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='pipe' filepath='/usr/include/unistd.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='968' column='1'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='fork' filepath='/usr/include/unistd.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-270'/>
@@ -29540,16 +29547,16 @@
       <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
       <parameter is-variadic='yes'/>
-      <return type-id='type-id-8'/>
+      <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-130'/>
-      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-10'/>
       <return type-id='type-id-45'/>
     </function-decl>
   </abi-instr>
@@ -29579,7 +29586,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedReadLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1760' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -29612,7 +29619,7 @@
         <member-function access='public' destructor='yes'>
           <function-decl name='~GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1758' is-artificial='yes'/>
-            <parameter type-id='type-id-8' is-artificial='yes'/>
+            <parameter type-id='type-id-10' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -29713,7 +29720,7 @@
       </class-decl>
       <function-decl name='GetLsb&lt;long long unsigned int&gt;' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-156'/>
-        <parameter type-id='type-id-8'/>
+        <parameter type-id='type-id-10'/>
         <return type-id='type-id-156'/>
       </function-decl>
       <function-decl name='DestroyAndFree&lt;__tsan::SyncVar&gt;' filepath='../../.././libsanitizer/tsan/tsan_mman.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 6a2edc35..b08f301a 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1565,25 +1565,84 @@
         <var-decl name='hash_value' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-130'/>
+    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-130'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='flags' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='pname' type-id='type-id-1' visibility='default' filepath='../.././libiberty/pex-common.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='tempbase' type-id='type-id-1' visibility='default' filepath='../.././libiberty/pex-common.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='next_input' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='next_input_name' type-id='type-id-52' visibility='default' filepath='../.././libiberty/pex-common.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='next_input_name_allocated' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='67' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <var-decl name='stderr_pipe' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='69' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='count' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='status' type-id='type-id-43' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='number_waited' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='input_file' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='read_output' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='83' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='read_err' type-id='type-id-90' visibility='default' filepath='../.././libiberty/pex-common.h' line='85' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='remove_count' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='87' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <var-decl name='remove' type-id='type-id-124' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <var-decl name='sysdep' type-id='type-id-17' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
+      </data-member>
+    </class-decl>
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-82'>
       <data-member access='private'>
-        <var-decl name='macro' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='answers' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='builtin' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='arg_index' type-id='type-id-30' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='673' column='1'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-147'/>
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-148'>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -1598,27 +1657,45 @@
       <enumerator name='BT_FIRST_USER' value='10'/>
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-150'/>
-    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-149'>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-154'/>
+    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='first' type-id='type-id-152' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-156'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='user_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='user_microseconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='562' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='system_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='563' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='system_microseconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_macro' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-151'/>
-    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='192' id='type-id-152'>
+    <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
+    <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
+    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
       <subrange length='1' type-id='type-id-7' id='type-id-10'/>
     </array-type-def>
-    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-153'>
+    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-155'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
           <data-member access='private'>
-            <var-decl name='tokens' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
@@ -1626,10 +1703,10 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-157' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='exp' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='54' column='1'/>
@@ -1659,22 +1736,56 @@
         <var-decl name='extra_tokens' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-156'/>
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-154'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
       <member-type access='public'>
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-158'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
           <data-member access='private'>
-            <var-decl name='node' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='source' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='str' type-id='type-id-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='macro_arg' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='token_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
@@ -1688,16 +1799,19 @@
         <var-decl name='src_loc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='type' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <var-decl name='flags' type-id='type-id-30' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='val' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-162'>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -1787,17 +1901,17 @@
       <enumerator name='CPP_LAST_PUNCTUATOR' value='52'/>
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-159'>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-161'>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='arg_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-160'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
       </data-member>
@@ -1807,7 +1921,7 @@
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-163'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DK_UNSPECIFIED' value='0'/>
       <enumerator name='DK_IGNORED' value='1'/>
@@ -1824,12 +1938,12 @@
       <enumerator name='DK_LAST_DIAGNOSTIC_KIND' value='12'/>
       <enumerator name='DK_POP' value='13'/>
     </enum-decl>
-    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-164'>
+    <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-186'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='info_ordinary' type-id='type-id-165' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='info_macro' type-id='type-id-165' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-187' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='depth' type-id='type-id-16' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='270' column='1'/>
@@ -1847,15 +1961,15 @@
         <var-decl name='max_column_hint' type-id='type-id-16' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='283' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='reallocator' type-id='type-id-166' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-188' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='round_alloc_size' type-id='type-id-167' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-189' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-165'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-187'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='maps' type-id='type-id-168' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-190' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='allocated' type-id='type-id-16' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='253' column='1'/>
@@ -1867,16 +1981,16 @@
         <var-decl name='cache' type-id='type-id-16' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='259' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='line_map_realloc' type-id='type-id-169' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-166'/>
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-170' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-167'/>
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-171'>
+    <typedef-decl name='line_map_realloc' type-id='type-id-191' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-188'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-192' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-189'/>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-193'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
-    <typedef-decl name='expanded_location' type-id='type-id-172' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-173'/>
-    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-173' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-172'>
+    <typedef-decl name='expanded_location' type-id='type-id-194' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-195'/>
+    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-195' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-194'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='file' type-id='type-id-1' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
       </data-member>
@@ -1890,11 +2004,11 @@
         <var-decl name='sysp' type-id='type-id-5' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='598' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-174'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-197'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-192'/>
+    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-191'/>
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-128'/>
@@ -2080,10 +2194,10 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././gcc/../libcpp/include/line-map.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-171'/>
-      <parameter type-id='type-id-174'/>
+      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-196'/>
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='pp_base_newline' mangled-name='_Z15pp_base_newlineP17pretty_print_info' filepath='../.././gcc/pretty-print.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15pp_base_newlineP17pretty_print_info'>
@@ -2099,14 +2213,14 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././gcc/../libcpp/include/line-map.h' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='expand_location' mangled-name='_Z15expand_locationj' filepath='../.././gcc/input.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15expand_locationj'>
       <parameter type-id='type-id-104'/>
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
@@ -2128,7 +2242,7 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././gcc/../libcpp/include/line-map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -2137,18 +2251,18 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-176'>
+    <function-type size-in-bits='64' id='type-id-198'>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-33'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-177'>
+    <function-type size-in-bits='64' id='type-id-199'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-17'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-178'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -2826,13 +2940,13 @@
       <enumerator name='gt_e_P13libfunc_entry4htab' value='673'/>
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-179'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-201'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
-      <parameter type-id='type-id-178' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-200' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <parameter type-id='type-id-33' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
@@ -2844,12 +2958,12 @@
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <var-decl name='rtl_zone' type-id='type-id-179' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
-    <var-decl name='tree_zone' type-id='type-id-179' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
-    <var-decl name='tree_id_zone' type-id='type-id-179' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-201' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-201' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-201' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-180'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-22' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
       </data-member>
@@ -2884,30 +2998,30 @@
         <var-decl name='duplicated_macro_maps_locations_size' type-id='type-id-22' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='697' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <return type-id='type-id-32'/>
     </function-decl>
-    <var-decl name='line_table' type-id='type-id-175' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-197' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <var-decl name='input_location' type-id='type-id-76' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././gcc/../libcpp/include/line-map.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <parameter type-id='type-id-49'/>
       <parameter type-id='type-id-104'/>
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././gcc/../libcpp/include/line-map.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
-      <parameter type-id='type-id-175'/>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-203'/>
       <return type-id='type-id-32'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-182'/>
-    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-183'/>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-186'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
+    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-205'/>
+    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-208'/>
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-33'/>
@@ -2935,7 +3049,7 @@
       <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-205'/>
       <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strcasecmp' filepath='/usr/include/string.h' line='536' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2944,13 +3058,13 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-186'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-207'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -2962,11 +3076,11 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <typedef-decl name='iconv_t' type-id='type-id-17' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-187'/>
-    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-190'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-192'/>
+    <typedef-decl name='iconv_t' type-id='type-id-17' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-210'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <parameter type-id='type-id-40' name='pp' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
       <parameter type-id='type-id-2' name='length' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
@@ -2985,7 +3099,7 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
-      <parameter type-id='type-id-189' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-211' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pp_base_remaining_character_count_for_line' mangled-name='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info'>
@@ -3030,7 +3144,7 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-192' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-214' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <var-decl name='identifier_to_locale_free' type-id='type-id-141' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <function-decl name='xstrerror' filepath='../.././gcc/../include/libiberty.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
@@ -3049,43 +3163,43 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-209'/>
       <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-212'/>
       <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-212'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-209'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='iconv_open' filepath='/usr/include/iconv.h' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-209'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-191'>
+    <function-type size-in-bits='64' id='type-id-213'>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-17'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-193'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-194' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-195' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-217' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='symbol' type-id='type-id-196' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-197'/>
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-196'>
+    <typedef-decl name='symbol' type-id='type-id-218' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-219'/>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-218'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file' type-id='type-id-198' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-220' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='chosen' type-id='type-id-2' visibility='default' filepath='../.././gcc/tlink.c' line='57' column='1'/>
@@ -3097,7 +3211,7 @@
         <var-decl name='tweaked' type-id='type-id-2' visibility='default' filepath='../.././gcc/tlink.c' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-199'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-221'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
       </data-member>
@@ -3114,38 +3228,38 @@
         <var-decl name='tweaking' type-id='type-id-2' visibility='default' filepath='../.././gcc/tlink.c' line='68' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-200'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-222'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-201' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-223' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-202' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-224' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='file' type-id='type-id-199' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-203'/>
-    <typedef-decl name='hashval_t' type-id='type-id-16' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-204'/>
-    <typedef-decl name='htab_t' type-id='type-id-205' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-206'/>
-    <typedef-decl name='htab_hash' type-id='type-id-207' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-208'/>
-    <typedef-decl name='htab_eq' type-id='type-id-209' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-210'/>
-    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-211'/>
-    <typedef-decl name='htab_alloc' type-id='type-id-212' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-213'/>
-    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-214'/>
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-215' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-216'/>
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-217' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-218'/>
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-219'>
+    <typedef-decl name='file' type-id='type-id-221' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-225'/>
+    <typedef-decl name='hashval_t' type-id='type-id-16' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-226'/>
+    <typedef-decl name='htab_t' type-id='type-id-227' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-228'/>
+    <typedef-decl name='htab_hash' type-id='type-id-229' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-230'/>
+    <typedef-decl name='htab_eq' type-id='type-id-231' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-232'/>
+    <typedef-decl name='htab_del' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-233'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-234' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-235'/>
+    <typedef-decl name='htab_free' type-id='type-id-141' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-236'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-237' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-238'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-239' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-240'/>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-241'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-220'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-242'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='hash_f' type-id='type-id-208' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-230' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='eq_f' type-id='type-id-210' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-232' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='del_f' type-id='type-id-211' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-233' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='entries' type-id='type-id-101' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='111' column='1'/>
@@ -3166,48 +3280,48 @@
         <var-decl name='collisions' type-id='type-id-16' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='alloc_f' type-id='type-id-213' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-235' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_f' type-id='type-id-214' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-236' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='alloc_arg' type-id='type-id-17' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='alloc_with_arg_f' type-id='type-id-216' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-238' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='free_with_arg_f' type-id='type-id-218' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-240' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='size_prime_index' type-id='type-id-16' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='141' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-205'/>
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-209'/>
-    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-194'/>
-    <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-212'/>
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-220'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-227'/>
+    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
     <var-decl name='symbol_stack_obstack' type-id='type-id-59' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
-    <var-decl name='symbol_stack' type-id='type-id-195' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-217' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <var-decl name='file_stack_obstack' type-id='type-id-59' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
-    <var-decl name='file_stack' type-id='type-id-202' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-224' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
-      <return type-id='type-id-204'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-204'/>
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-241'/>
       <return type-id='type-id-101'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3235,10 +3349,10 @@
     </function-decl>
     <function-decl name='htab_create' filepath='../.././gcc/../include/hashtab.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-208'/>
-      <parameter type-id='type-id-210'/>
-      <parameter type-id='type-id-211'/>
-      <return type-id='type-id-206'/>
+      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-232'/>
+      <parameter type-id='type-id-233'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-52'/>
@@ -3253,26 +3367,26 @@
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-52'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-221'>
+    <function-type size-in-bits='64' id='type-id-243'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-222'>
+    <function-type size-in-bits='64' id='type-id-244'>
       <parameter type-id='type-id-17'/>
-      <return type-id='type-id-204'/>
+      <return type-id='type-id-226'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-223'>
+    <function-type size-in-bits='64' id='type-id-245'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-224'>
+    <function-type size-in-bits='64' id='type-id-246'>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-225'>
+    <function-type size-in-bits='64' id='type-id-247'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
@@ -3379,122 +3493,122 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='248' id='type-id-226'>
-      <subrange length='31' type-id='type-id-7' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='248' id='type-id-248'>
+      <subrange length='31' type-id='type-id-7' id='type-id-249'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='48' id='type-id-228'>
-      <subrange length='6' type-id='type-id-7' id='type-id-229'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='48' id='type-id-250'>
+      <subrange length='6' type-id='type-id-7' id='type-id-251'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='56' id='type-id-230'>
-      <subrange length='7' type-id='type-id-7' id='type-id-231'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='56' id='type-id-252'>
+      <subrange length='7' type-id='type-id-7' id='type-id-253'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='248' id='type-id-232'>
-      <subrange length='31' type-id='type-id-7' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='248' id='type-id-254'>
+      <subrange length='31' type-id='type-id-7' id='type-id-249'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-233'>
-      <subrange length='6' type-id='type-id-7' id='type-id-229'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-255'>
+      <subrange length='6' type-id='type-id-7' id='type-id-251'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-234'>
-      <subrange length='7' type-id='type-id-7' id='type-id-231'/>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-256'>
+      <subrange length='7' type-id='type-id-7' id='type-id-253'/>
     </array-type-def>
-    <var-decl name='version_string' type-id='type-id-233' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
-    <var-decl name='pkgversion_string' type-id='type-id-234' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
-    <var-decl name='bug_report_url' type-id='type-id-232' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='version_string' type-id='type-id-255' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-256' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='bug_report_url' type-id='type-id-254' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <parameter type-id='type-id-238' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <return type-id='type-id-238'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-260' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-236' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-235' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-258' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-257' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <parameter type-id='type-id-2' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
-      <parameter type-id='type-id-239' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
-      <return type-id='type-id-238'/>
+      <parameter type-id='type-id-261' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-262'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-241'/>
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-181'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
-      <parameter type-id='type-id-235' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-257' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <return type-id='type-id-117'/>
     </function-decl>
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <parameter type-id='type-id-1' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
-      <parameter type-id='type-id-242' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-264' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-33' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
-      <parameter type-id='type-id-243' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <parameter type-id='type-id-244' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <return type-id='type-id-242'/>
+      <parameter type-id='type-id-265' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-266' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-243'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-244'/>
-    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-238'/>
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-242'/>
-    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-245'/>
-    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-246'/>
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-249'>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-266'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-264'/>
+    <qualified-type-def type-id='type-id-270' const='yes' id='type-id-267'/>
+    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-268'/>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='previous' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='prev_class' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='level' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_reader' type-id='type-id-253' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-247'/>
-    <typedef-decl name='cpp_string' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-248'/>
-    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-250'/>
-    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-251'/>
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-252'>
+    <typedef-decl name='cpp_reader' type-id='type-id-275' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-269'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-270'/>
+    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-272'/>
+    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-273'/>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-274'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
       <enumerator name='normalized_identifier_C' value='2'/>
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-253'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-275'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-254'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-276'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='first_line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='532' column='1'/>
@@ -3502,40 +3616,40 @@
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overlaid_buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='state' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='line_table' type-id='type-id-175' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='directive_line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='u_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_buffs' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='base_context' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='context' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='directive' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='directive_result' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='invocation_location' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -3544,31 +3658,31 @@
         <var-decl name='set_invocation_location' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='quote_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bracket_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='no_search_path' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='all_files' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='main_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='dir_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='file_hash_entries' type-id='type-id-266' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='nonexistent_file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <var-decl name='nonexistent_file_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='437' column='1'/>
@@ -3580,22 +3694,22 @@
         <var-decl name='seen_once_only' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='mi_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='mi_ind_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <var-decl name='mi_valid' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='cur_token' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='base_run' type-id='type-id-268' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='cur_run' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='lookaheads' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='455' column='1'/>
@@ -3604,25 +3718,25 @@
         <var-decl name='keep_tokens' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='macro_buffer' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='macro_buffer_len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='narrow_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='utf8_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='char16_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='char32_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='wide_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <var-decl name='date' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
@@ -3631,13 +3745,13 @@
         <var-decl name='time' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='avoid_paste' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='eof' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='deps' type-id='type-id-271' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <var-decl name='hash_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='497' column='1'/>
@@ -3646,31 +3760,31 @@
         <var-decl name='buffer_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='501' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='pragmas' type-id='type-id-272' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='cb' type-id='type-id-273' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='hash_table' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='op_stack' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='op_limit' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='opts' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='spec_nodes' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <var-decl name='our_hashtable' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='524' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='out' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <var-decl name='saved_cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
@@ -3682,106 +3796,106 @@
         <var-decl name='saved_line_base' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='savedstate' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <var-decl name='counter' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='comments' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
-        <var-decl name='pushed_macros' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <var-decl name='forced_token_location_p' type-id='type-id-118' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-258'/>
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-265'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-261'/>
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-256'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-272'/>
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-273'>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-283'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-294'/>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file_change' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dir_change' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='include' type-id='type-id-296' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ident' type-id='type-id-298' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='def_pragma' type-id='type-id-299' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='valid_pch' type-id='type-id-300' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='read_pch' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='missing_header' type-id='type-id-302' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='macro_to_expand' type-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='error' type-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='used_define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='used_undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='before_define' type-id='type-id-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='used' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='user_builtin_macro' type-id='type-id-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-259'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-281'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-307'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-329'>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-308'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-330'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='last' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-310'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
@@ -3791,17 +3905,17 @@
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-330' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-311'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-333'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -3809,27 +3923,27 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='u' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-329' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='c' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tokens_kind' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-264'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='559' column='1'/>
@@ -3847,23 +3961,23 @@
         <var-decl name='canonical_name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='name_map' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='construct' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ino' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='dev' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-276'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-298'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-318'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-340'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='missing_files' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -3883,7 +3997,7 @@
         <var-decl name='tabstop' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lang' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cplusplus' type-id='type-id-28' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -4009,7 +4123,7 @@
         <var-decl name='input_charset' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='warn_normalize' type-id='type-id-252' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <var-decl name='warn_invalid_pch' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -4018,7 +4132,7 @@
         <var-decl name='restore_pch_deps' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deps' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='precision' type-id='type-id-33' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -4048,18 +4162,18 @@
         <var-decl name='directives_only' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-270'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cd' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='width' type-id='type-id-2' visibility='default' filepath='../.././libcpp/internal.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-257'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-279'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='in_directive' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
       </data-member>
@@ -4103,7 +4217,7 @@
         <var-decl name='pragma_allow_expansion' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='271' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-277'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='n_defined' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
       </data-member>
@@ -4117,19 +4231,19 @@
         <var-decl name='n__VA_ARGS__' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-269'/>
-    <typedef-decl name='cpp_comment_table' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-279'/>
-    <typedef-decl name='cpp_token' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-262'/>
-    <typedef-decl name='tokenrun' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-314'/>
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-283'/>
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-303'/>
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-320'>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-291'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-345' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-301'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-284'/>
+    <typedef-decl name='tokenrun' type-id='type-id-344' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-349' const='yes' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-325'/>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-342'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -4144,35 +4258,35 @@
       <enumerator name='CLK_CXX11' value='10'/>
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-313'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-335'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-319'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-341'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-281'>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-334'/>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-282'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-304'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
       </data-member>
@@ -4186,19 +4300,19 @@
         <var-decl name='dir_name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='next_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='buffer' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='buffer_start' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='dir' type-id='type-id-263' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-285' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='st' type-id='type-id-63' visibility='default' filepath='../.././libcpp/files.c' line='90' column='1'/>
@@ -4225,7 +4339,7 @@
         <var-decl name='buffer_valid' type-id='type-id-5' visibility='default' filepath='../.././libcpp/files.c' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-285'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
@@ -4242,7 +4356,7 @@
         <var-decl name='rlimit' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='notes' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-354' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='cur_note' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -4254,16 +4368,16 @@
         <var-decl name='notes_cap' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='prev' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='timestamp' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='if_stack' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -4281,22 +4395,22 @@
         <var-decl name='sysp' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='dir' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='input_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-286'/>
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-287'>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-308'/>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/internal.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='definition' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='367' column='1'/>
@@ -4311,9 +4425,9 @@
         <var-decl name='is_undef' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-288'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-310'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ntargets' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -4322,7 +4436,7 @@
         <var-decl name='targets_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='depv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ndeps' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -4331,10 +4445,10 @@
         <var-decl name='deps_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='vpathv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='vpathlv' type-id='type-id-190' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='nvpaths' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='42' column='1'/>
@@ -4343,19 +4457,19 @@
         <var-decl name='vpaths_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-289'/>
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-290'>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'/>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-59' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='entries' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='alloc_node' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='alloc_subobject' type-id='type-id-192' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='nslots' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='59' column='1'/>
@@ -4364,7 +4478,7 @@
         <var-decl name='nelements' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pfile' type-id='type-id-237' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='searches' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='66' column='1'/>
@@ -4376,38 +4490,38 @@
         <var-decl name='entries_owned' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/symtab.h' line='70' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-291'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-337' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-359' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='loc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/expr.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='op' type-id='type-id-162' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-292'/>
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-322'>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-314'/>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='base' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-279' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-323'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-345'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-2' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -4416,47 +4530,47 @@
         <var-decl name='allocated' type-id='type-id-2' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='convert_f' type-id='type-id-339' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-321'/>
-    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-317'/>
-    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-316'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-340' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-302'/>
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-309'>
+    <typedef-decl name='convert_f' type-id='type-id-361' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-343'/>
+    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-339'/>
+    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-338'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-362' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-324'/>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-331'>
       <data-member access='private'>
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ptoken' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-363' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-301'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-297'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-333'/>
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-328'/>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-327'/>
-    <typedef-decl name='cpp_num' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-335'/>
-    <typedef-decl name='macro_context' type-id='type-id-360' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-331'/>
-    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-354'/>
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-358'>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-354'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-355'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-350'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-349'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-357'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-376'/>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='high' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='low' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='unsignedp' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='805' column='1'/>
@@ -4465,8 +4579,8 @@
         <var-decl name='overflow' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='806' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-357'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-360'>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-353' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -4477,11 +4591,11 @@
         <var-decl name='cur_virt_loc' type-id='type-id-118' visibility='default' filepath='../.././libcpp/internal.h' line='157' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_cpp_line_note' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-351'/>
-    <typedef-decl name='cpp_comment' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-355'/>
-    <typedef-decl name='hashnode' type-id='type-id-364' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-356'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-364'/>
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-362'>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-373'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-386'/>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
@@ -4489,7 +4603,7 @@
         <var-decl name='type' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='293' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-363'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='comment' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
       </data-member>
@@ -4497,31 +4611,31 @@
         <var-decl name='sloc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <typedef-decl name='pragma_cb' type-id='type-id-305' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-365'/>
-    <typedef-decl name='cpp_options' type-id='type-id-276' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-366'/>
-    <typedef-decl name='cpp_callbacks' type-id='type-id-273' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-367'/>
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-368'>
+    <typedef-decl name='pragma_cb' type-id='type-id-327' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
+    <typedef-decl name='cpp_options' type-id='type-id-298' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-388'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-295' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-389'/>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-390'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
       <enumerator name='IT_IMPORT' value='2'/>
       <enumerator name='IT_CMDLINE' value='3'/>
     </enum-decl>
-    <typedef-decl name='cpp_cb' type-id='type-id-369' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-369'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-374'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-391' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-396'/>
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <parameter type-id='type-id-1' name='to_file' filepath='../.././libcpp/directives.c' line='1035' column='1'/>
       <parameter type-id='type-id-116' name='file_line' filepath='../.././libcpp/directives.c' line='1035' column='1'/>
@@ -4529,15 +4643,15 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <parameter type-id='type-id-1' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
-      <parameter type-id='type-id-365' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-387' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <parameter type-id='type-id-5' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <parameter type-id='type-id-1' name='name' filepath='../.././libcpp/directives.c' line='1238' column='1'/>
       <parameter type-id='type-id-16' name='ident' filepath='../.././libcpp/directives.c' line='1238' column='1'/>
@@ -4546,95 +4660,95 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <return type-id='type-id-124'/>
     </function-decl>
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <parameter type-id='type-id-124' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
-      <parameter type-id='type-id-374' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-396' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
-      <return type-id='type-id-372'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <return type-id='type-id-394'/>
     </function-decl>
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
-      <return type-id='type-id-371'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <return type-id='type-id-393'/>
     </function-decl>
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
-      <parameter type-id='type-id-371' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-393' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
-      <return type-id='type-id-271'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <return type-id='type-id-293'/>
     </function-decl>
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
-      <parameter type-id='type-id-235' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-257' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <parameter type-id='type-id-2' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter type-id='type-id-1' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/include/cpplib.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-117'/>
     </function-decl>
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/include/cpplib.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-145'/>
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-16'/>
@@ -4643,12 +4757,12 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-32'/>
@@ -4660,59 +4774,59 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-368'/>
+      <parameter type-id='type-id-390'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-117'/>
     </function-decl>
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/include/cpplib.h' line='1006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/include/cpplib.h' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-370'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-392'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-262'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-241'/>
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-181'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/include/mkdeps.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
-      <return type-id='type-id-271'/>
+      <return type-id='type-id-293'/>
     </function-decl>
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4720,8 +4834,8 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-33'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-373'>
-      <parameter type-id='type-id-237' name='pfile'/>
+    <function-type size-in-bits='64' id='type-id-395'>
+      <parameter type-id='type-id-259' name='pfile'/>
       <parameter type-id='type-id-117' name='node'/>
       <parameter type-id='type-id-17' name='v'/>
       <return type-id='type-id-2'/>
@@ -4729,7 +4843,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <parameter is-variadic='yes'/>
@@ -4742,13 +4856,13 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <typedef-decl name='cpp_num' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-337'/>
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-358'>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-359'/>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='high' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='low' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='unsignedp' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='805' column='1'/>
@@ -4757,8 +4871,8 @@
         <var-decl name='overflow' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='806' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
-    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-238'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-29' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-16' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-260'/>
     <function-decl name='cpp_interpret_float_suffix' mangled-name='_Z26cpp_interpret_float_suffixPKcm' filepath='../.././libcpp/expr.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26cpp_interpret_float_suffixPKcm'>
       <parameter type-id='type-id-1' name='s' filepath='../.././libcpp/expr.c' line='190' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/expr.c' line='190' column='1'/>
@@ -4770,71 +4884,71 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_remove_type' mangled-name='_Z30cpp_userdef_string_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z30cpp_userdef_string_remove_type9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_add_type' mangled-name='_Z27cpp_userdef_string_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_userdef_string_add_type9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_remove_type' mangled-name='_Z28cpp_userdef_char_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_userdef_char_remove_type9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_add_type' mangled-name='_Z25cpp_userdef_char_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_userdef_char_add_type9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-162'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-181'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_p' mangled-name='_Z20cpp_userdef_string_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_userdef_string_p9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_p' mangled-name='_Z18cpp_userdef_char_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_userdef_char_p9cpp_ttype'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_get_userdef_suffix' mangled-name='_Z22cpp_get_userdef_suffixPK9cpp_token' filepath='../.././libcpp/expr.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_get_userdef_suffixPK9cpp_token'>
-      <parameter type-id='type-id-336' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-358' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_classify_number' mangled-name='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc' filepath='../.././libcpp/expr.c' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
-      <parameter type-id='type-id-314' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-336' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='cpp_interpret_integer' mangled-name='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj' filepath='../.././libcpp/expr.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <parameter type-id='type-id-16' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
-      <return type-id='type-id-337'/>
+      <return type-id='type-id-359'/>
     </function-decl>
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
-      <return type-id='type-id-275'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <return type-id='type-id-297'/>
     </function-decl>
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
-      <parameter type-id='type-id-337' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-359' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <parameter type-id='type-id-33' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
-      <return type-id='type-id-337'/>
+      <return type-id='type-id-359'/>
     </function-decl>
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/include/cpplib.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-336'/>
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-358'/>
+      <parameter type-id='type-id-396'/>
       <parameter type-id='type-id-43'/>
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-260'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-375'>
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-397'>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
-    <typedef-decl name='ssize_t' type-id='type-id-377' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-378'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-377'/>
-    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-250'/>
-    <typedef-decl name='DIR' type-id='type-id-379' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-380'/>
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-381'>
+    <typedef-decl name='ssize_t' type-id='type-id-399' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-400'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-399'/>
+    <typedef-decl name='off_t' type-id='type-id-55' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-272'/>
+    <typedef-decl name='DIR' type-id='type-id-401' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-402'/>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-403'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='d_ino' type-id='type-id-65' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
       </data-member>
@@ -4848,98 +4962,98 @@
         <var-decl name='d_type' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='d_name' type-id='type-id-375' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-397' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__compar_fn_t' type-id='type-id-209' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-382'/>
-    <typedef-decl name='htab_trav' type-id='type-id-383' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-384'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-243'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-383'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-244'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-231' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-404'/>
+    <typedef-decl name='htab_trav' type-id='type-id-405' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-406'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-266'/>
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
-      <parameter type-id='type-id-265' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-287' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
-      <parameter type-id='type-id-263' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-285' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-5' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-2' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
-      <return type-id='type-id-265'/>
+      <return type-id='type-id-287'/>
     </function-decl>
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
-      <parameter type-id='type-id-265' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-287' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <parameter type-id='type-id-5' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <parameter type-id='type-id-104' name='location' filepath='../.././libcpp/files.c' line='1115' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <parameter type-id='type-id-1' name='new_name' filepath='../.././libcpp/files.c' line='1237' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
-      <parameter type-id='type-id-263' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
-      <parameter type-id='type-id-263' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-285' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-285' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <parameter type-id='type-id-2' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
-      <parameter type-id='type-id-265' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
-      <return type-id='type-id-263'/>
+      <parameter type-id='type-id-287' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <return type-id='type-id-285'/>
     </function-decl>
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
-      <parameter type-id='type-id-256' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
-      <return type-id='type-id-256'/>
+      <parameter type-id='type-id-278' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
@@ -4960,7 +5074,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/include/mkdeps.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
@@ -4979,34 +5093,34 @@
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-378'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-277'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-243'/>
-      <parameter type-id='type-id-244'/>
-      <return type-id='type-id-255'/>
+      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-266'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-385'/>
+      <return type-id='type-id-407'/>
     </function-decl>
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-385'/>
-      <return type-id='type-id-386'/>
+      <parameter type-id='type-id-407'/>
+      <return type-id='type-id-408'/>
     </function-decl>
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-385'/>
+      <parameter type-id='type-id-407'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-204'/>
+      <parameter type-id='type-id-226'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5014,36 +5128,36 @@
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-382'/>
+      <parameter type-id='type-id-404'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='htab_create_alloc' filepath='../.././libcpp/../include/hashtab.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-208'/>
-      <parameter type-id='type-id-210'/>
-      <parameter type-id='type-id-211'/>
-      <parameter type-id='type-id-213'/>
-      <parameter type-id='type-id-214'/>
-      <return type-id='type-id-206'/>
+      <parameter type-id='type-id-230'/>
+      <parameter type-id='type-id-232'/>
+      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-235'/>
+      <parameter type-id='type-id-236'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-382'/>
+      <parameter type-id='type-id-404'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-228'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-206'/>
-      <parameter type-id='type-id-384'/>
+      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-406'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-32'/>
     </function-decl>
@@ -5064,120 +5178,120 @@
       <parameter type-id='type-id-90'/>
       <return type-id='type-id-33'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-387'>
+    <function-type size-in-bits='64' id='type-id-409'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <typedef-decl name='ht_cb' type-id='type-id-388' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-388'/>
+    <typedef-decl name='ht_cb' type-id='type-id-410' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-410'/>
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
-      <parameter type-id='type-id-391' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <parameter type-id='type-id-145' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <parameter type-id='type-id-2' name='len' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/include/symtab.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='ht_create' mangled-name='_Z9ht_createj' filepath='../.././libcpp/include/symtab.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_createj'>
       <parameter type-id='type-id-16'/>
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-413'/>
     </function-decl>
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/include/symtab.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
-      <parameter type-id='type-id-391'/>
-      <parameter type-id='type-id-389'/>
+      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-411'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-390'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-356'/>
+    <function-type size-in-bits='64' id='type-id-412'>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-378'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-391'/>
-    <typedef-decl name='hash_table' type-id='type-id-290' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
+    <typedef-decl name='hash_table' type-id='type-id-312' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-150' size-in-bits='2048' id='type-id-393'>
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-415'>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='2048' id='type-id-394'>
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='2048' id='type-id-416'>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
-      <parameter type-id='type-id-320' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-342' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
-      <parameter type-id='type-id-320' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
-      <parameter type-id='type-id-391' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
-      <parameter type-id='type-id-175' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
-      <return type-id='type-id-237'/>
+      <parameter type-id='type-id-342' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-413' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <return type-id='type-id-259'/>
     </function-decl>
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
-      <parameter type-id='type-id-175' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-197' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-394' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-416' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-249'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-271'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='previous' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='prev_class' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='level' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_context' type-id='type-id-259' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-395'/>
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-396'>
+    <typedef-decl name='cpp_context' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-417'/>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-418'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -5187,10 +5301,10 @@
       <enumerator name='CPP_TOKEN_FLD_PRAGMA' value='5'/>
       <enumerator name='CPP_TOKEN_FLD_NONE' value='6'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-261'/>
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <parameter type-id='type-id-1' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -5198,73 +5312,73 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
-      <return type-id='type-id-397'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
-      <parameter type-id='type-id-269' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-291' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
-      <parameter type-id='type-id-260' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-282' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
-      <parameter type-id='type-id-162' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <parameter type-id='type-id-28' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
-      <parameter type-id='type-id-336' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-358' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
-      <parameter type-id='type-id-336' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
-      <parameter type-id='type-id-336' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-358' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-358' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
-      <parameter type-id='type-id-156' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
-      <return type-id='type-id-396'/>
+      <parameter type-id='type-id-164' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <return type-id='type-id-418'/>
     </function-decl>
     <function-decl name='cpp_force_token_locations' mangled-name='_Z25cpp_force_token_locationsP10cpp_readerPj' filepath='../.././libcpp/lex.c' line='2910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_force_token_locationsP10cpp_readerPj'>
-      <parameter type-id='type-id-237' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-259' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <parameter type-id='type-id-118' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-265'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-239'/>
-      <return type-id='type-id-238'/>
+      <parameter type-id='type-id-261'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-117'/>
     </function-decl>
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-16'/>
-      <parameter type-id='type-id-398'/>
-      <return type-id='type-id-356'/>
+      <parameter type-id='type-id-420'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <function-decl name='memmove' filepath='/usr/include/string.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
@@ -5273,33 +5387,33 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='cpp_named_operator2name' mangled-name='cpp_named_operator2name' filepath='../.././libcpp/internal.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpp_named_operator2name'>
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-181'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-398'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-420'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
     </enum-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='192' id='type-id-152'>
+    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
       <subrange length='1' type-id='type-id-7' id='type-id-10'/>
     </array-type-def>
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-154'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
       <member-type access='public'>
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-158'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
           <data-member access='private'>
-            <var-decl name='node' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='source' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='str' type-id='type-id-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='macro_arg' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='token_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
@@ -5313,13 +5427,13 @@
         <var-decl name='src_loc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='type' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <var-decl name='flags' type-id='type-id-30' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='val' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-80'>
@@ -5341,36 +5455,36 @@
     </enum-decl>
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-82'>
       <data-member access='private'>
-        <var-decl name='macro' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='answers' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='builtin' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='arg_index' type-id='type-id-30' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='673' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='cpp_macro' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-151'/>
-    <typedef-decl name='cpp_token' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-262'/>
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-159'>
+    <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
+    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-284'/>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-327'/>
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-161'>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-79' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-349'/>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='arg_no' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-153'>
+    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-155'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
           <data-member access='private'>
-            <var-decl name='tokens' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
@@ -5378,10 +5492,10 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-157' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='exp' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='54' column='1'/>
@@ -5411,7 +5525,7 @@
         <var-decl name='extra_tokens' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-162'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -5501,18 +5615,18 @@
       <enumerator name='CPP_LAST_PUNCTUATOR' value='52'/>
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
-    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-149'>
+    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='first' type-id='type-id-152' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-148'>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-151'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -5527,7 +5641,7 @@
       <enumerator name='BT_FIRST_USER' value='10'/>
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-160'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
       </data-member>
@@ -5535,22 +5649,22 @@
         <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-147'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-150'/>
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <parameter type-id='type-id-109' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <parameter type-id='type-id-16' name='sysp' filepath='../.././libcpp/line-map.c' line='164' column='1'/>
       <parameter type-id='type-id-1' name='to_file' filepath='../.././libcpp/line-map.c' line='164' column='1'/>
@@ -5558,11 +5672,11 @@
       <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <parameter type-id='type-id-117' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <parameter type-id='type-id-104' name='expansion' filepath='../.././libcpp/line-map.c' line='306' column='1'/>
       <parameter type-id='type-id-16' name='num_tokens' filepath='../.././libcpp/line-map.c' line='306' column='1'/>
@@ -5576,24 +5690,24 @@
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <parameter type-id='type-id-116' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <parameter type-id='type-id-16' name='max_column_hint' filepath='../.././libcpp/line-map.c' line='388' column='1'/>
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <parameter type-id='type-id-16' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='linemap_position_for_line_and_column' mangled-name='_Z36linemap_position_for_line_and_columnP8line_mapjj' filepath='../.././libcpp/line-map.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z36linemap_position_for_line_and_columnP8line_mapjj'>
-      <parameter type-id='type-id-168' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
+      <parameter type-id='type-id-190' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
       <parameter type-id='type-id-116' name='line' filepath='../.././libcpp/line-map.c' line='496' column='1'/>
       <parameter type-id='type-id-16' name='column' filepath='../.././libcpp/line-map.c' line='497' column='1'/>
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <parameter type-id='type-id-104' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <return type-id='type-id-49'/>
     </function-decl>
@@ -5602,12 +5716,12 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-197'/>
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <parameter type-id='type-id-104' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5616,32 +5730,32 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <parameter type-id='type-id-104' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <parameter type-id='type-id-104' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
-      <parameter type-id='type-id-174' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-196' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='linemap_dump' mangled-name='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb' filepath='../.././libcpp/line-map.c' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb'>
       <parameter type-id='type-id-90' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <parameter type-id='type-id-16' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <parameter type-id='type-id-5' name='is_macro' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <parameter type-id='type-id-104' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <parameter type-id='type-id-90' name='stream' filepath='../.././libcpp/line-map.c' line='1213' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='line_table_dump' mangled-name='_Z15line_table_dumpP8_IO_FILEP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15line_table_dumpP8_IO_FILEP9line_mapsjj'>
       <parameter type-id='type-id-90' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
-      <parameter type-id='type-id-175' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-197' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <parameter type-id='type-id-16' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <parameter type-id='type-id-16' name='num_macro' filepath='../.././libcpp/line-map.c' line='1316' column='1'/>
       <return type-id='type-id-32'/>
@@ -5653,7 +5767,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-282'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-304'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
       </data-member>
@@ -5667,19 +5781,19 @@
         <var-decl name='dir_name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='next_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='buffer' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='buffer_start' type-id='type-id-235' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-257' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='dir' type-id='type-id-263' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-285' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='st' type-id='type-id-63' visibility='default' filepath='../.././libcpp/files.c' line='90' column='1'/>
@@ -5706,17 +5820,17 @@
         <var-decl name='buffer_valid' type-id='type-id-5' visibility='default' filepath='../.././libcpp/files.c' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-253'>
+    <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-275'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-254'>
+        <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-276'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='first_line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='532' column='1'/>
@@ -5724,40 +5838,40 @@
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overlaid_buffer' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='state' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='line_table' type-id='type-id-175' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-197' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='directive_line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='u_buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_buffs' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='base_context' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='context' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='directive' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='directive_result' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='invocation_location' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -5766,31 +5880,31 @@
         <var-decl name='set_invocation_location' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='quote_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bracket_include' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='no_search_path' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='all_files' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='main_file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='dir_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='file_hash_entries' type-id='type-id-266' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='nonexistent_file_hash' type-id='type-id-205' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <var-decl name='nonexistent_file_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='437' column='1'/>
@@ -5802,22 +5916,22 @@
         <var-decl name='seen_once_only' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='mi_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='mi_ind_cmacro' type-id='type-id-267' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <var-decl name='mi_valid' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='cur_token' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='base_run' type-id='type-id-268' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='cur_run' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='lookaheads' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='455' column='1'/>
@@ -5826,25 +5940,25 @@
         <var-decl name='keep_tokens' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='macro_buffer' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='macro_buffer_len' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='narrow_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='utf8_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='char16_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='char32_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='wide_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <var-decl name='date' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
@@ -5853,13 +5967,13 @@
         <var-decl name='time' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='avoid_paste' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='eof' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='deps' type-id='type-id-271' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <var-decl name='hash_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='497' column='1'/>
@@ -5868,31 +5982,31 @@
         <var-decl name='buffer_ob' type-id='type-id-59' visibility='default' filepath='../.././libcpp/internal.h' line='501' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='pragmas' type-id='type-id-272' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='cb' type-id='type-id-273' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='hash_table' type-id='type-id-274' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-296' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='op_stack' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='op_limit' type-id='type-id-275' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-297' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='opts' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='spec_nodes' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <var-decl name='our_hashtable' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='524' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='out' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <var-decl name='saved_cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
@@ -5904,24 +6018,24 @@
         <var-decl name='saved_line_base' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='savedstate' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-300' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <var-decl name='counter' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='comments' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-301' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
-        <var-decl name='pushed_macros' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <var-decl name='forced_token_location_p' type-id='type-id-118' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-288'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-310'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ntargets' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -5930,7 +6044,7 @@
         <var-decl name='targets_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='depv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ndeps' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -5939,10 +6053,10 @@
         <var-decl name='deps_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='vpathv' type-id='type-id-314' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-336' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='vpathlv' type-id='type-id-190' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-212' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='nvpaths' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='42' column='1'/>
@@ -5951,9 +6065,9 @@
         <var-decl name='vpaths_size' type-id='type-id-16' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_buffer' type-id='type-id-285' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-399'/>
-    <typedef-decl name='_cpp_line_note' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-351'/>
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-362'>
+    <typedef-decl name='cpp_buffer' type-id='type-id-307' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-421'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-373'/>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
@@ -5961,9 +6075,9 @@
         <var-decl name='type' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='293' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-264'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-286'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='559' column='1'/>
@@ -5981,33 +6095,33 @@
         <var-decl name='canonical_name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='name_map' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='construct' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ino' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='dev' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-316'/>
-    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-317'/>
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-270'>
+    <typedef-decl name='ino_t' type-id='type-id-65' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-338'/>
+    <typedef-decl name='dev_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-339'/>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cd' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-209' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='width' type-id='type-id-2' visibility='default' filepath='../.././libcpp/internal.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='convert_f' type-id='type-id-339' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-321'/>
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-257'>
+    <typedef-decl name='convert_f' type-id='type-id-361' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-343'/>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-279'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='in_directive' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
       </data-member>
@@ -6051,18 +6165,18 @@
         <var-decl name='pragma_allow_expansion' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='271' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-290'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-59' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='entries' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='alloc_node' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='alloc_subobject' type-id='type-id-192' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-214' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='nslots' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='59' column='1'/>
@@ -6071,7 +6185,7 @@
         <var-decl name='nelements' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pfile' type-id='type-id-237' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-259' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='searches' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/symtab.h' line='66' column='1'/>
@@ -6083,40 +6197,40 @@
         <var-decl name='entries_owned' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/symtab.h' line='70' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_cpp_buff' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-400'/>
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-281'>
+    <typedef-decl name='_cpp_buff' type-id='type-id-303' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-422'/>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='base' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cur' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-322'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-269' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='base' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-276'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-298'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-318'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-340'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='missing_files' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -6136,7 +6250,7 @@
         <var-decl name='tabstop' type-id='type-id-16' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lang' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cplusplus' type-id='type-id-28' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -6262,7 +6376,7 @@
         <var-decl name='input_charset' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='warn_normalize' type-id='type-id-252' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <var-decl name='warn_invalid_pch' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -6271,7 +6385,7 @@
         <var-decl name='restore_pch_deps' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deps' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='precision' type-id='type-id-33' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -6301,35 +6415,35 @@
         <var-decl name='directives_only' type-id='type-id-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-291'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-337' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-359' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='loc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/expr.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='op' type-id='type-id-162' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-259'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-281'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-307'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-329'>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-308'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-330'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='last' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-310'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-332'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
@@ -6339,17 +6453,17 @@
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-330' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-311'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-333'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -6357,34 +6471,34 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='u' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-329' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='buff' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='c' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tokens_kind' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-309'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-331'>
       <data-member access='private'>
-        <var-decl name='token' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-358' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ptoken' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-363' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='macro_context' type-id='type-id-360' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-331'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-360'>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-353'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-353' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -6395,69 +6509,69 @@
         <var-decl name='cur_virt_loc' type-id='type-id-118' visibility='default' filepath='../.././libcpp/internal.h' line='157' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-273'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file_change' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dir_change' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='include' type-id='type-id-296' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ident' type-id='type-id-298' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='def_pragma' type-id='type-id-299' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='valid_pch' type-id='type-id-300' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='read_pch' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='missing_header' type-id='type-id-302' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='macro_to_expand' type-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='error' type-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='used_define' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='used_undef' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='before_define' type-id='type-id-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='used' type-id='type-id-297' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='user_builtin_macro' type-id='type-id-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-313'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-335'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-285'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
@@ -6474,7 +6588,7 @@
         <var-decl name='rlimit' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='notes' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-354' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='cur_note' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -6486,16 +6600,16 @@
         <var-decl name='notes_cap' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='prev' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='file' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='timestamp' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='if_stack' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-5' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -6513,26 +6627,26 @@
         <var-decl name='sysp' type-id='type-id-28' visibility='default' filepath='../.././libcpp/internal.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='dir' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='input_cset_desc' type-id='type-id-270' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='tokenrun' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-268'/>
-    <typedef-decl name='cpp_reader' type-id='type-id-253' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-247'/>
-    <typedef-decl name='cpp_string' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-248'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-340' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-302'/>
-    <typedef-decl name='cpp_dir' type-id='type-id-264' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-401'/>
-    <typedef-decl name='hashnode' type-id='type-id-364' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-356'/>
-    <typedef-decl name='hash_table' type-id='type-id-290' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-392'/>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-319'>
+    <typedef-decl name='tokenrun' type-id='type-id-344' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-290'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-275' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-269'/>
+    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-270'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-362' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-324'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-286' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-423'/>
+    <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
+    <typedef-decl name='hash_table' type-id='type-id-312' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-341'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-320'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-342'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -6547,14 +6661,14 @@
       <enumerator name='CLK_CXX11' value='10'/>
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-252'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-274'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
       <enumerator name='normalized_identifier_C' value='2'/>
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-277'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-299'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='n_defined' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
       </data-member>
@@ -6568,10 +6682,10 @@
         <var-decl name='n__VA_ARGS__' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_comment_table' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-279'/>
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-279' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-323'>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-345' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-301'/>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-345'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-2' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -6580,8 +6694,8 @@
         <var-decl name='allocated' type-id='type-id-2' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_comment' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-355'/>
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-363'>
+    <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-377' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-385'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='comment' type-id='type-id-52' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
       </data-member>
@@ -6589,15 +6703,15 @@
         <var-decl name='sloc' type-id='type-id-104' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-287'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-309'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-280' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-302' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-52' visibility='default' filepath='../.././libcpp/internal.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='definition' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='line' type-id='type-id-104' visibility='default' filepath='../.././libcpp/internal.h' line='367' column='1'/>
@@ -6612,9 +6726,9 @@
         <var-decl name='is_undef' type-id='type-id-16' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-251'/>
-    <typedef-decl name='time_t' type-id='type-id-83' filepath='/usr/include/time.h' line='76' column='1' id='type-id-402'/>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-403'>
+    <typedef-decl name='uchar' type-id='type-id-28' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-273'/>
+    <typedef-decl name='time_t' type-id='type-id-83' filepath='/usr/include/time.h' line='76' column='1' id='type-id-424'/>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-425'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-2' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
@@ -6649,137 +6763,137 @@
         <var-decl name='tm_zone' type-id='type-id-1' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_cpp_file' type-id='type-id-282' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-258'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-405'/>
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-265'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-340'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-314'/>
-    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-283'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-267'/>
-    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-408'/>
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-409'/>
-    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-240'/>
-    <qualified-type-def type-id='type-id-262' const='yes' id='type-id-354'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-341'/>
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-261'/>
-    <qualified-type-def type-id='type-id-402' const='yes' id='type-id-410'/>
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
-    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-413'/>
-    <qualified-type-def type-id='type-id-251' const='yes' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-256'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-391'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-274'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-364'/>
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-415'/>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-416'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-255'/>
-    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-301'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-297'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-304' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-354'/>
+    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-349' const='yes' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-289'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
+    <qualified-type-def type-id='type-id-270' const='yes' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-262'/>
+    <qualified-type-def type-id='type-id-284' const='yes' id='type-id-376'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-433'/>
+    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
+    <qualified-type-def type-id='type-id-273' const='yes' id='type-id-268'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-436'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-259'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-355'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-438'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-319'/>
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <parameter type-id='type-id-17' name='v' filepath='../.././libcpp/macro.c' line='179' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
-      <return type-id='type-id-235'/>
+      <return type-id='type-id-257'/>
     </function-decl>
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
-      <parameter type-id='type-id-242' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
-      <parameter type-id='type-id-235' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-264' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-257' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <parameter type-id='type-id-16' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
-      <parameter type-id='type-id-146' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
-      <parameter type-id='type-id-267' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-289' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <parameter type-id='type-id-16' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <parameter type-id='type-id-117' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
-      <parameter type-id='type-id-336' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-358' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <parameter type-id='type-id-117' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
-      <parameter type-id='type-id-235' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <parameter type-id='type-id-16' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <parameter type-id='type-id-118' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
-      <return type-id='type-id-336'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_free_definition' mangled-name='_cpp_free_definition' filepath='../.././libcpp/macro.c' line='2579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_definition'>
@@ -6787,46 +6901,46 @@
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
-      <parameter type-id='type-id-146' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-149' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-117'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <return type-id='type-id-145'/>
     </function-decl>
     <var-decl name='num_expanded_macros_counter' type-id='type-id-16' mangled-name='num_expanded_macros_counter' visibility='default' filepath='../.././libcpp/macro.c' line='170' column='1' elf-symbol-id='num_expanded_macros_counter'/>
     <var-decl name='num_macro_tokens_counter' type-id='type-id-16' mangled-name='num_macro_tokens_counter' visibility='default' filepath='../.././libcpp/macro.c' line='173' column='1' elf-symbol-id='num_macro_tokens_counter'/>
     <function-decl name='_cpp_temp_token' mangled-name='_cpp_temp_token' filepath='../.././libcpp/internal.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_temp_token'>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-156'/>
+      <parameter type-id='type-id-259'/>
+      <return type-id='type-id-164'/>
     </function-decl>
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-405'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-427'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_lex_direct' mangled-name='_cpp_lex_direct' filepath='../.././libcpp/internal.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_direct'>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-156'/>
+      <parameter type-id='type-id-259'/>
+      <return type-id='type-id-164'/>
     </function-decl>
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-16'/>
@@ -6835,131 +6949,131 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-415'/>
-      <return type-id='type-id-402'/>
+      <parameter type-id='type-id-437'/>
+      <return type-id='type-id-424'/>
     </function-decl>
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/include/cpplib.h' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-411'/>
-      <return type-id='type-id-416'/>
+      <parameter type-id='type-id-433'/>
+      <return type-id='type-id-438'/>
     </function-decl>
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-435'/>
       <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-132'/>
     </function-decl>
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/include/cpplib.h' line='1012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
-      <parameter type-id='type-id-256'/>
-      <return type-id='type-id-265'/>
+      <parameter type-id='type-id-278'/>
+      <return type-id='type-id-287'/>
     </function-decl>
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/include/cpplib.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-256'/>
+      <parameter type-id='type-id-259'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/include/cpplib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-256'/>
+      <return type-id='type-id-278'/>
     </function-decl>
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-336'/>
-      <return type-id='type-id-255'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-358'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/include/cpplib.h' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-336'/>
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-358'/>
+      <parameter type-id='type-id-277'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-258'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-280'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-258'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/include/cpplib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-336'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
-      <return type-id='type-id-336'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <return type-id='type-id-358'/>
     </function-decl>
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
-      <parameter type-id='type-id-336'/>
-      <parameter type-id='type-id-336'/>
+      <parameter type-id='type-id-358'/>
+      <parameter type-id='type-id-358'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
-      <parameter type-id='type-id-409'/>
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-431'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-16'/>
@@ -6968,7 +7082,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-16'/>
@@ -6977,38 +7091,38 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-146'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-149'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-255'/>
+      <return type-id='type-id-277'/>
     </function-decl>
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
-      <parameter type-id='type-id-409'/>
+      <parameter type-id='type-id-431'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-409'/>
-      <parameter type-id='type-id-255'/>
-      <return type-id='type-id-255'/>
+      <parameter type-id='type-id-431'/>
+      <parameter type-id='type-id-277'/>
+      <return type-id='type-id-277'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-324'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-346'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-117'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-325'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-347'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-104'/>
@@ -7017,135 +7131,135 @@
       <parameter type-id='type-id-99'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-352'>
-      <parameter type-id='type-id-187'/>
+    <function-type size-in-bits='64' id='type-id-374'>
+      <parameter type-id='type-id-209'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-429'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-326'>
+    <function-type size-in-bits='64' id='type-id-348'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-263'/>
+      <parameter type-id='type-id-285'/>
       <return type-id='type-id-52'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-353'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-375'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-414'/>
+      <parameter type-id='type-id-436'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-329'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-336'/>
+    <function-type size-in-bits='64' id='type-id-351'>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-358'/>
       <return type-id='type-id-117'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-330'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-352'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-359'>
-      <parameter type-id='type-id-391'/>
-      <return type-id='type-id-356'/>
+    <function-type size-in-bits='64' id='type-id-381'>
+      <parameter type-id='type-id-413'/>
+      <return type-id='type-id-378'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-342'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-364'>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-343'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-365'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-344'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-366'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-345'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-336'/>
+    <function-type size-in-bits='64' id='type-id-367'>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-346'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-368'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-49'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-347'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-369'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-348'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-370'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-262'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-349'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-371'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-341'/>
+      <parameter type-id='type-id-363'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-350'>
-      <parameter type-id='type-id-237'/>
+    <function-type size-in-bits='64' id='type-id-372'>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-117'/>
       <return type-id='type-id-32'/>
     </function-type>
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-406'/>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-428'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-417'/>
-    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-310' const='yes' id='type-id-439'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-440'/>
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
-      <parameter type-id='type-id-271' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-293' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
-      <parameter type-id='type-id-271' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-293' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <parameter type-id='type-id-1' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <parameter type-id='type-id-2' name='quote' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-293'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
-      <parameter type-id='type-id-418' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-440' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <parameter type-id='type-id-16' name='colmax' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
-      <parameter type-id='type-id-418' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-440' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <parameter type-id='type-id-90' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
-      <parameter type-id='type-id-271' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-293' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <parameter type-id='type-id-90' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
-      <parameter type-id='type-id-271' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-293' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <parameter type-id='type-id-90' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <parameter type-id='type-id-1' name='self' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <return type-id='type-id-2'/>
@@ -7153,21 +7267,21 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
-      <parameter type-id='type-id-391'/>
-      <parameter type-id='type-id-389'/>
+      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-411'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='ht_load' mangled-name='_Z7ht_loadP2htPP13ht_identifierjjb' filepath='../.././libcpp/symtab.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z7ht_loadP2htPP13ht_identifierjjb'>
-      <parameter type-id='type-id-391' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
-      <parameter type-id='type-id-334' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-413' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-356' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <parameter type-id='type-id-16' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-16' name='nelements' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-5' name='own' filepath='../.././libcpp/symtab.c' line='264' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_obstack_memory_used' filepath='../.././libcpp/../include/obstack.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7176,66 +7290,66 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-398'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-420'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
     </enum-decl>
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
-      <parameter type-id='type-id-235' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-257' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
-      <parameter type-id='type-id-237'/>
-      <parameter type-id='type-id-146'/>
+      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-149'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
-      <parameter type-id='type-id-409' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
-      <parameter type-id='type-id-242' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
-      <return type-id='type-id-242'/>
+      <parameter type-id='type-id-431' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-264' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
-      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-413'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
-      <parameter type-id='type-id-398'/>
-      <return type-id='type-id-356'/>
+      <parameter type-id='type-id-420'/>
+      <return type-id='type-id-378'/>
     </function-decl>
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-145'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-237' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-259' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <parameter type-id='type-id-117' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <return type-id='type-id-145'/>
     </function-decl>
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
-      <parameter type-id='type-id-237'/>
+      <parameter type-id='type-id-259'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -7312,28 +7426,28 @@
     <var-decl name='libiberty_concat_ptr' type-id='type-id-52' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <array-type-def dimensions='1' type-id='type-id-419' size-in-bits='8448' id='type-id-420'>
-      <subrange length='33' type-id='type-id-7' id='type-id-421'/>
+    <array-type-def dimensions='1' type-id='type-id-441' size-in-bits='8448' id='type-id-442'>
+      <subrange length='33' type-id='type-id-7' id='type-id-443'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-422' size-in-bits='11136' id='type-id-423'>
-      <subrange length='58' type-id='type-id-7' id='type-id-424'/>
+    <array-type-def dimensions='1' type-id='type-id-444' size-in-bits='11136' id='type-id-445'>
+      <subrange length='58' type-id='type-id-7' id='type-id-446'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-425' size-in-bits='8448' id='type-id-426'>
-      <subrange length='33' type-id='type-id-7' id='type-id-421'/>
+    <array-type-def dimensions='1' type-id='type-id-447' size-in-bits='8448' id='type-id-448'>
+      <subrange length='33' type-id='type-id-7' id='type-id-443'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-427' size-in-bits='11136' id='type-id-428'>
-      <subrange length='58' type-id='type-id-7' id='type-id-424'/>
+    <array-type-def dimensions='1' type-id='type-id-449' size-in-bits='11136' id='type-id-450'>
+      <subrange length='58' type-id='type-id-7' id='type-id-446'/>
     </array-type-def>
-    <type-decl name='short int' size-in-bits='16' id='type-id-429'/>
-    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-430'>
+    <type-decl name='short int' size-in-bits='16' id='type-id-451'/>
+    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-452'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-453' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='u' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-454' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-431'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-453'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -7407,45 +7521,45 @@
       <enumerator name='DEMANGLE_COMPONENT_PACK_EXPANSION' value='69'/>
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-432'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-454'>
       <data-member access='private'>
-        <var-decl name='s_name' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-455' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_operator' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-456' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_extended_operator' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-457' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_fixed' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-458' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_ctor' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-459' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_dtor' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_builtin' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_string' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_number' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_character' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_binary' type-id='type-id-443' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_unary_num' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-433'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-455'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
       </data-member>
@@ -7453,12 +7567,12 @@
         <var-decl name='len' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='447' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-434'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-456'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-427'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-449'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='code' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
       </data-member>
@@ -7472,61 +7586,61 @@
         <var-decl name='args' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-435'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-457'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='args' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-436'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-458'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='length' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='accum' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='sat' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-451' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-437'>
+    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-447'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-469'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
       <enumerator name='gnu_v3_complete_object_allocating_ctor' value='3'/>
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
-    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-438'>
+    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-460'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kind' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-470' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-448'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-470'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
       <enumerator name='gnu_v3_base_object_dtor' value='3'/>
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
-    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-439'>
+    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-461'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-449' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-471' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-425'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-447'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
       </data-member>
@@ -7540,10 +7654,10 @@
         <var-decl name='java_len' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='print' type-id='type-id-450' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-472' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-450'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-472'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -7556,7 +7670,7 @@
       <enumerator name='D_PRINT_FLOAT' value='8'/>
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
-    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-440'>
+    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-462'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='string' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
       </data-member>
@@ -7564,33 +7678,33 @@
         <var-decl name='len' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='508' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-441'>
+    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-463'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='number' type-id='type-id-22' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-442'>
+    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-464'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='character' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-443'>
+    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-465'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='left' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='right' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-444'>
+    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-466'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sub' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='num' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='538' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-451'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-473'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
       </data-member>
@@ -7604,7 +7718,7 @@
         <var-decl name='n' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='comps' type-id='type-id-446' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='next_comp' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='106' column='1'/>
@@ -7613,7 +7727,7 @@
         <var-decl name='num_comps' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='subs' type-id='type-id-452' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-474' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='next_sub' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='112' column='1'/>
@@ -7625,106 +7739,106 @@
         <var-decl name='did_subs' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='last_name' type-id='type-id-446' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-468' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='expansion' type-id='type-id-2' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='124' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='demangle_callbackref' type-id='type-id-453' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-454'/>
-    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-419'/>
-    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-455'/>
-    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-422'/>
-    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-445'/>
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-446'/>
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-453'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-475' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-476'/>
+    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-441'/>
+    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-471'/>
+    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-478'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-475'/>
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <parameter type-id='type-id-1' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <parameter type-id='type-id-2' name='len' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <parameter type-id='type-id-2' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
-      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-469' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
-      <parameter type-id='type-id-446' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
-      <parameter type-id='type-id-448' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
-      <parameter type-id='type-id-446' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-468' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-470' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-468' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
-      <return type-id='type-id-446'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <return type-id='type-id-468'/>
     </function-decl>
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <parameter type-id='type-id-2' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
-      <return type-id='type-id-446'/>
+      <return type-id='type-id-468'/>
     </function-decl>
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
-      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='cplus_demangle_print' mangled-name='cplus_demangle_print' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print'>
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
-      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-478' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <parameter type-id='type-id-2' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
-      <parameter type-id='type-id-190' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-212' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='cplus_demangle_init_info' mangled-name='cplus_demangle_init_info' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_init_info'>
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
-      <parameter type-id='type-id-457' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-479' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='cplus_demangle_v3_callback' mangled-name='cplus_demangle_v3_callback' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_v3_callback'>
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='java_demangle_v3_callback' mangled-name='java_demangle_v3_callback' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='java_demangle_v3_callback'>
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
-      <parameter type-id='type-id-454' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-476' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <parameter type-id='type-id-17' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='is_gnu_v3_mangled_ctor' mangled-name='is_gnu_v3_mangled_ctor' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_ctor'>
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
-      <return type-id='type-id-447'/>
+      <return type-id='type-id-469'/>
     </function-decl>
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
-      <return type-id='type-id-448'/>
+      <return type-id='type-id-470'/>
     </function-decl>
-    <var-decl name='cplus_demangle_operators' type-id='type-id-423' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-420' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <var-decl name='cplus_demangle_operators' type-id='type-id-445' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-442' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-458'>
+    <function-type size-in-bits='64' id='type-id-480'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-33'/>
       <parameter type-id='type-id-17'/>
@@ -7732,13 +7846,13 @@
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <array-type-def dimensions='1' type-id='type-id-459' size-in-bits='2112' id='type-id-460'>
-      <subrange length='11' type-id='type-id-7' id='type-id-461'/>
+    <array-type-def dimensions='1' type-id='type-id-481' size-in-bits='2112' id='type-id-482'>
+      <subrange length='11' type-id='type-id-7' id='type-id-483'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-462' size-in-bits='2112' id='type-id-463'>
-      <subrange length='11' type-id='type-id-7' id='type-id-461'/>
+    <array-type-def dimensions='1' type-id='type-id-484' size-in-bits='2112' id='type-id-485'>
+      <subrange length='11' type-id='type-id-7' id='type-id-483'/>
     </array-type-def>
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-464'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-486'>
       <underlying-type type-id='type-id-27'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -7752,20 +7866,20 @@
       <enumerator name='java_demangling' value='4'/>
       <enumerator name='gnat_demangling' value='32768'/>
     </enum-decl>
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-462'>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-484'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='demangling_style_name' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='demangling_style' type-id='type-id-466' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-488' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='demangling_style_doc' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-487' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-465'/>
-    <qualified-type-def type-id='type-id-462' const='yes' id='type-id-459'/>
-    <qualified-type-def type-id='type-id-464' const='yes' id='type-id-466'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-487'/>
+    <qualified-type-def type-id='type-id-484' const='yes' id='type-id-481'/>
+    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-488'/>
     <function-decl name='__builtin_stpcpy' mangled-name='stpcpy' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-1'/>
@@ -7822,12 +7936,12 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
-      <parameter type-id='type-id-464' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
-      <return type-id='type-id-464'/>
+      <parameter type-id='type-id-486' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <return type-id='type-id-486'/>
     </function-decl>
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
-      <return type-id='type-id-464'/>
+      <return type-id='type-id-486'/>
     </function-decl>
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cplus-dem.c' line='881' column='1'/>
@@ -7840,8 +7954,8 @@
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cplus-dem.c' line='632' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <var-decl name='current_demangling_style' type-id='type-id-464' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
-    <var-decl name='libiberty_demanglers' type-id='type-id-460' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <var-decl name='current_demangling_style' type-id='type-id-486' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <var-decl name='libiberty_demanglers' type-id='type-id-482' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <function-decl name='cplus_demangle_v3' mangled-name='cplus_demangle_v3' filepath='../.././libiberty/../include/demangle.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_v3'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
@@ -7901,103 +8015,103 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <type-decl name='double' size-in-bits='64' id='type-id-467'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-489'/>
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='htab_create_alloc_ex' mangled-name='htab_create_alloc_ex' filepath='../.././libiberty/hashtab.c' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_alloc_ex'>
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <parameter type-id='type-id-17' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
-      <parameter type-id='type-id-216' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
-      <parameter type-id='type-id-218' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
-      <return type-id='type-id-206'/>
+      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
-      <parameter type-id='type-id-213' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
-      <parameter type-id='type-id-213' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
-      <parameter type-id='type-id-214' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
-      <return type-id='type-id-206'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-235' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-235' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-236' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <parameter type-id='type-id-17' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
-      <parameter type-id='type-id-216' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
-      <parameter type-id='type-id-218' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-238' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-240' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_try_create' mangled-name='htab_try_create' filepath='../.././libiberty/hashtab.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_try_create'>
       <parameter type-id='type-id-33' name='size' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
-      <parameter type-id='type-id-208' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
-      <parameter type-id='type-id-210' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
-      <parameter type-id='type-id-211' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
-      <return type-id='type-id-206'/>
+      <parameter type-id='type-id-230' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-232' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-233' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <return type-id='type-id-228'/>
     </function-decl>
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
-      <parameter type-id='type-id-219' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-241' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <return type-id='type-id-101'/>
     </function-decl>
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
-      <parameter type-id='type-id-204' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-226' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <parameter type-id='type-id-17' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <parameter type-id='type-id-101' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
-      <parameter type-id='type-id-384' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-406' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <parameter type-id='type-id-17' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
-      <parameter type-id='type-id-206' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
-      <return type-id='type-id-467'/>
+      <parameter type-id='type-id-228' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <return type-id='type-id-489'/>
     </function-decl>
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
       <parameter type-id='type-id-17' name='k_in' filepath='../.././libiberty/hashtab.c' line='931' column='1'/>
       <parameter type-id='type-id-33' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
-      <parameter type-id='type-id-204' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
-      <return type-id='type-id-204'/>
+      <parameter type-id='type-id-226' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <return type-id='type-id-226'/>
     </function-decl>
-    <var-decl name='htab_hash_pointer' type-id='type-id-208' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
-    <var-decl name='htab_eq_pointer' type-id='type-id-210' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_hash_pointer' type-id='type-id-230' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-232' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='hex_init' mangled-name='hex_init' filepath='../.././libiberty/hex.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hex_init'>
       <return type-id='type-id-32'/>
     </function-decl>
-    <var-decl name='_hex_value' type-id='type-id-393' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <var-decl name='_hex_value' type-id='type-id-415' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='unix_lbasename' mangled-name='unix_lbasename' filepath='../.././libiberty/lbasename.c' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unix_lbasename'>
@@ -8020,60 +8134,60 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <array-type-def dimensions='1' type-id='type-id-468' size-in-bits='64' id='type-id-469'>
-      <subrange length='2' type-id='type-id-7' id='type-id-470'/>
+    <array-type-def dimensions='1' type-id='type-id-490' size-in-bits='64' id='type-id-491'>
+      <subrange length='2' type-id='type-id-7' id='type-id-492'/>
     </array-type-def>
-    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-471'>
+    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-493'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='A' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='B' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='C' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='D' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='total' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-491' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='buflen' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-490' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='buffer' type-id='type-id-6' visibility='default' filepath='../.././libiberty/../include/md5.h' line='94' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='md5_uint32' type-id='type-id-472' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-468'/>
-    <typedef-decl name='uint32_t' type-id='type-id-16' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-472'/>
-    <qualified-type-def type-id='type-id-471' const='yes' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
-    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-475'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-494' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-490'/>
+    <typedef-decl name='uint32_t' type-id='type-id-16' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-494'/>
+    <qualified-type-def type-id='type-id-493' const='yes' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-497'/>
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
-      <parameter type-id='type-id-474' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-496' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <parameter type-id='type-id-17' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='md5_process_block' mangled-name='md5_process_block' filepath='../.././libiberty/md5.c' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_process_block'>
       <parameter type-id='type-id-17' name='buffer' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='md5_process_bytes' mangled-name='md5_process_bytes' filepath='../.././libiberty/md5.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_process_bytes'>
       <parameter type-id='type-id-17' name='buffer' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <parameter type-id='type-id-33' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
-      <parameter type-id='type-id-475' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-497' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <parameter type-id='type-id-17' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <return type-id='type-id-17'/>
     </function-decl>
@@ -8116,13 +8230,13 @@
         <var-decl name='count' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='children' type-id='type-id-476' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='status' type-id='type-id-43' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='time' type-id='type-id-477' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='number_waited' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
@@ -8143,15 +8257,15 @@
         <var-decl name='remove' type-id='type-id-124' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='funcs' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='sysdep' type-id='type-id-17' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='pid_t' type-id='type-id-479' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-480'/>
-    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-479'/>
-    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-481'>
+    <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
+    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
+    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-156'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='user_seconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
       </data-member>
@@ -8165,51 +8279,51 @@
         <var-decl name='system_microseconds' type-id='type-id-29' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-482'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='open_read' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='open_write' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='exec_child' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='close' type-id='type-id-485' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='wait' type-id='type-id-486' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='pipe' type-id='type-id-487' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fdopenr' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='fdopenw' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='cleanup' type-id='type-id-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-488'/>
-    <qualified-type-def type-id='type-id-482' const='yes' id='type-id-491'/>
-    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-478'/>
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-483'/>
-    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-485'/>
-    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-477'/>
-    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-476'/>
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-486'/>
-    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <parameter type-id='type-id-2' name='flags' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <parameter type-id='type-id-1' name='pname' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <parameter type-id='type-id-1' name='tempbase' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
-      <parameter type-id='type-id-478' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
+      <parameter type-id='type-id-148' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
       <return type-id='type-id-131'/>
     </function-decl>
     <function-decl name='pex_run_in_environment' mangled-name='pex_run_in_environment' filepath='../.././libiberty/pex-common.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_run_in_environment'>
@@ -8242,33 +8356,33 @@
     <function-decl name='pex_get_times' mangled-name='pex_get_times' filepath='../.././libiberty/pex-common.c' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_get_times'>
       <parameter type-id='type-id-131' name='obj' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <parameter type-id='type-id-2' name='count' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
-      <parameter type-id='type-id-477' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
+      <parameter type-id='type-id-147' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-490'>
+    <function-type size-in-bits='64' id='type-id-173'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-90'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-492'>
+    <function-type size-in-bits='64' id='type-id-174'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-493'>
+    <function-type size-in-bits='64' id='type-id-175'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-494'>
+    <function-type size-in-bits='64' id='type-id-176'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-495'>
+    <function-type size-in-bits='64' id='type-id-182'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-1'/>
@@ -8278,21 +8392,21 @@
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-314'/>
+      <parameter type-id='type-id-336'/>
       <parameter type-id='type-id-43'/>
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-157'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-496'>
+    <function-type size-in-bits='64' id='type-id-183'>
       <parameter type-id='type-id-131'/>
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-157'/>
       <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-477'/>
+      <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-314'/>
+      <parameter type-id='type-id-336'/>
       <parameter type-id='type-id-43'/>
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-157'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-497'>
+    <function-type size-in-bits='64' id='type-id-184'>
       <parameter type-id='type-id-131'/>
       <return type-id='type-id-32'/>
     </function-type>
@@ -8398,7 +8512,7 @@
     <typedef-decl name='__suseconds_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-506'/>
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-507'/>
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-500'/>
-    <var-decl name='funcs' type-id='type-id-491' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
+    <var-decl name='funcs' type-id='type-id-153' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
@@ -8410,20 +8524,20 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='wait4' filepath='/usr/include/sys/wait.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-499'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-507'/>
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='kill' filepath='/usr/include/signal.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-479'/>
+      <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -8431,7 +8545,7 @@
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-33'/>
-      <return type-id='type-id-378'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
@@ -8442,7 +8556,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vfork' filepath='/usr/include/unistd.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-479'/>
+      <return type-id='type-id-161'/>
     </function-decl>
     <function-decl name='dup2' filepath='/usr/include/unistd.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
@@ -8462,15 +8576,15 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <array-type-def dimensions='1' type-id='type-id-508' size-in-bits='4096' id='type-id-509'>
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='4096' id='type-id-510'>
-      <subrange length='256' type-id='type-id-7' id='type-id-376'/>
+      <subrange length='256' type-id='type-id-7' id='type-id-398'/>
     </array-type-def>
     <qualified-type-def type-id='type-id-30' const='yes' id='type-id-508'/>
     <var-decl name='_sch_istable' type-id='type-id-509' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
-    <var-decl name='_sch_toupper' type-id='type-id-393' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
-    <var-decl name='_sch_tolower' type-id='type-id-393' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <var-decl name='_sch_toupper' type-id='type-id-415' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <var-decl name='_sch_tolower' type-id='type-id-415' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>