* [PATCH] Bump ABIXML format version to 2.0
@ 2021-02-01 13:34 Dodji Seketeli
0 siblings, 0 replies; only message in thread
From: Dodji Seketeli @ 2021-02-01 13:34 UTC (permalink / raw)
To: libabigail
Hello,
After fixing the interpretation of the DW_AT_bit_offset attribute for
offset of bit field data members, serialized abixml might now be
incompatible with versions of Libabigail that use the previous
interpretation.
That means that comparing an abixml file generated with previous
versions of Libabigail against a corpus resulting from an analysis
performed with the current version of libabigail might yield spurious
changes due to the differences in the way we now interpret the
DW_AT_bit_offset.
Hence, this patch bumps the version of abixml files emitted from now
on to "2.0". This version is deemed incompatible with the previous
"1.0" version.
Subsequently, an abixml file of the "1.0" format cannot be compared
against an abixml file of the "2.0" format, or against a binary
analyzed with a current version of Libabigail.
It's thus advised that abixml files of the "1.0" format version should
be re-generated with a current version of Libabigail, bumping their
format version number to the new "2.0".
* include/abg-corpus.h (corpus::init_format_version): Declare new
private method.
(corpus::set_environment): Make this non-const.
(corpus::{get,set}_format_{major,minor}_version_number): Declare
new accessors.
* src/abg-corpus.cc (corpus::init_format_version): Define new
method.
(corpus::set_environment): By default, initialize the format
version number of the corpus to the one supported by Libabigail.
(corpus::{get,set}_format_{major,minor}_version_number): Define
new accessors.
* include/abg-ir.h: Include abg-config.h to use the
abigail::config.
(environment::get_config): Declare new accessor.
* src/abg-ir.cc (environment::priv::config_): Add new data member.
(environment::get_config): Define new accessor.
* src/abg-config.cc (config::config): Bump the format
version number to "2.0".
* src/abg-corpus-priv.h
(corpus::priv::format_{major,minor}_version_number_): Add new data members.
* src/abg-reader.cc (handle_version_attribute): Define new static
function.
(read_corpus_from_input, read_corpus_group_from_input): Use it to
read the value of the "version" attribute and set the format
version number of the corpus and corpus group accordingly.
* src/abg-writer.cc (write_context::m_config): Remove the config
object because we can now get it from the environment.
(write_context::get_config): Get the config object from the
environment.
(write_translation_unit): Do not emit the version attribute on the
translation unit element anymore.
(write_version_info): Define static function.
(write_corpus, write_corpus_group): Use it to emit version
attribute on both the corpus and corpus group elements.
* tools/abidiff.cc
(emit_incomptatible_format_version_error_message): Define new
static function.
(main): Ensure that corpora and corpus groups being compared have
the same major version number.
* tests/update-test-output.py: Adjust syntax for python3.
* tests/data/test-annotate/libtest23.so.abi: Adjust.
* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Likewise.
* tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise.
* tests/data/test-annotate/test-anonymous-members-0.o.abi:
Likewise.
* tests/data/test-annotate/test0.abi: Likewise.
* tests/data/test-annotate/test1.abi: Likewise.
* tests/data/test-annotate/test13-pr18894.so.abi: Likewise.
* tests/data/test-annotate/test14-pr18893.so.abi: Likewise.
* tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
* tests/data/test-annotate/test17-pr19027.so.abi: Likewise.
* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
Likewise.
* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
Likewise.
* tests/data/test-annotate/test2.so.abi: Likewise.
* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
Likewise.
* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
* tests/data/test-annotate/test3.so.abi: Likewise.
* tests/data/test-annotate/test4.so.abi: Likewise.
* tests/data/test-annotate/test5.o.abi: Likewise.
* tests/data/test-annotate/test6.so.abi: Likewise.
* tests/data/test-annotate/test7.so.abi: Likewise.
* tests/data/test-annotate/test8-qualified-this-pointer.so.abi:
Likewise.
* tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi:
Likewise.
* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt:
Likewise.
* tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi:
Likewise.
* tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi:
Likewise.
* tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi:
Likewise.
* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
Likewise.
* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
* tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi:
Likewise.
* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
* tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi:
Likewise.
* tests/data/test-read-dwarf/PR26261/PR26261-exe.abi: Likewise.
* tests/data/test-read-dwarf/libtest23.so.abi: Likewise.
* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
Likewise.
* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise.
* tests/data/test-read-dwarf/test-PR26568-1.o.abi: Likewise.
* tests/data/test-read-dwarf/test-PR26568-2.o.abi: Likewise.
* tests/data/test-read-dwarf/test0.abi: Likewise.
* tests/data/test-read-dwarf/test0.hash.abi: Likewise.
* tests/data/test-read-dwarf/test1.abi: Likewise.
* tests/data/test-read-dwarf/test1.hash.abi: Likewise.
* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise.
* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.
* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
* tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise.
* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.
* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise.
* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
Likewise.
* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
Likewise.
* tests/data/test-read-dwarf/test2.so.abi: Likewise.
* tests/data/test-read-dwarf/test2.so.hash.abi: Likewise.
* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
Likewise.
* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
Likewise.
* tests/data/test-read-dwarf/test3.so.abi: Likewise.
* tests/data/test-read-dwarf/test3.so.hash.abi: Likewise.
* tests/data/test-read-dwarf/test4.so.abi: Likewise.
* tests/data/test-read-dwarf/test4.so.hash.abi: Likewise.
* tests/data/test-read-dwarf/test5.o.abi: Likewise.
* tests/data/test-read-dwarf/test5.o.hash.abi: Likewise.
* tests/data/test-read-dwarf/test6.so.abi: Likewise.
* tests/data/test-read-dwarf/test6.so.hash.abi: Likewise.
* tests/data/test-read-dwarf/test7.so.abi: Likewise.
* tests/data/test-read-dwarf/test7.so.hash.abi: Likewise.
* tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi:
Likewise.
* tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi:
Likewise.
* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise.
* tests/data/test-read-write/test0.xml: Likewise.
* tests/data/test-read-write/test1.xml: Likewise.
* tests/data/test-read-write/test10.xml: Likewise.
* tests/data/test-read-write/test11.xml: Likewise.
* tests/data/test-read-write/test12.xml: Likewise.
* tests/data/test-read-write/test13.xml: Likewise.
* tests/data/test-read-write/test14.xml: Likewise.
* tests/data/test-read-write/test15.xml: Likewise.
* tests/data/test-read-write/test16.xml: Likewise.
* tests/data/test-read-write/test17.xml: Likewise.
* tests/data/test-read-write/test18.xml: Likewise.
* tests/data/test-read-write/test19.xml: Likewise.
* tests/data/test-read-write/test2.xml: Likewise.
* tests/data/test-read-write/test20.xml: Likewise.
* tests/data/test-read-write/test21.xml: Likewise.
* tests/data/test-read-write/test22.xml: Likewise.
* tests/data/test-read-write/test23.xml: Likewise.
* tests/data/test-read-write/test24.xml: Likewise.
* tests/data/test-read-write/test25.xml: Likewise.
* tests/data/test-read-write/test26.xml: Likewise.
* tests/data/test-read-write/test27.xml: Likewise.
* tests/data/test-read-write/test28-without-std-fns-ref.xml:
Likewise.
* tests/data/test-read-write/test28-without-std-vars-ref.xml:
Likewise.
* tests/data/test-read-write/test3.xml: Likewise.
* tests/data/test-read-write/test4.xml: Likewise.
* tests/data/test-read-write/test5.xml: Likewise.
* tests/data/test-read-write/test6.xml: Likewise.
* tests/data/test-read-write/test7.xml: Likewise.
* tests/data/test-read-write/test8.xml: Likewise.
* tests/data/test-read-write/test9.xml: Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
include/abg-corpus.h | 15 +-
include/abg-ir.h | 4 +
src/abg-config.cc | 2 +-
src/abg-corpus-priv.h | 3 +
src/abg-corpus.cc | 63 ++++-
src/abg-ir.cc | 8 +
src/abg-reader.cc | 37 +++
src/abg-writer.cc | 33 ++-
tests/data/test-annotate/libtest23.so.abi | 6 +-
.../test-annotate/libtest24-drop-fns-2.so.abi | 4 +-
.../test-annotate/libtest24-drop-fns.so.abi | 4 +-
.../test-anonymous-members-0.o.abi | 4 +-
tests/data/test-annotate/test0.abi | 4 +-
tests/data/test-annotate/test1.abi | 4 +-
.../data/test-annotate/test13-pr18894.so.abi | 34 +--
.../data/test-annotate/test14-pr18893.so.abi | 118 ++++----
.../data/test-annotate/test15-pr18892.so.abi | 120 ++++----
.../data/test-annotate/test17-pr19027.so.abi | 60 ++--
...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 48 ++--
...19-pr19023-libtcmalloc_and_profiler.so.abi | 74 ++---
tests/data/test-annotate/test2.so.abi | 6 +-
...st20-pr19025-libvtkParallelCore-6.1.so.abi | 26 +-
.../data/test-annotate/test21-pr19092.so.abi | 86 +++---
tests/data/test-annotate/test3.so.abi | 4 +-
tests/data/test-annotate/test4.so.abi | 4 +-
tests/data/test-annotate/test5.o.abi | 4 +-
tests/data/test-annotate/test6.so.abi | 4 +-
tests/data/test-annotate/test7.so.abi | 4 +-
.../test8-qualified-this-pointer.so.abi | 4 +-
.../PR25409-librte_bus_dpaa.so.20.0.abi | 20 +-
.../test0-pr19026-libvtkIOSQL-6.1.so.1.abi | 26 +-
.../libtest48-soname-abixml-v0.so.abi | 4 +-
.../libtest48-soname-abixml-v1.so.abi | 4 +-
.../PR22015-libboost_iostreams.so.abi | 6 +-
.../test-read-dwarf/PR22122-libftdc.so.abi | 22 +-
.../PR24378-fn-is-not-scope.abi | 4 +-
.../data/test-read-dwarf/PR25007-sdhci.ko.abi | 6 +-
.../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi | 58 ++--
.../test-read-dwarf/PR26261/PR26261-exe.abi | 8 +-
tests/data/test-read-dwarf/libtest23.so.abi | 6 +-
.../libtest24-drop-fns-2.so.abi | 4 +-
.../test-read-dwarf/libtest24-drop-fns.so.abi | 4 +-
.../data/test-read-dwarf/test-PR26568-1.o.abi | 4 +-
.../data/test-read-dwarf/test-PR26568-2.o.abi | 4 +-
.../test-read-dwarf/test-libandroid.so.abi | 46 ++--
tests/data/test-read-dwarf/test0.abi | 4 +-
tests/data/test-read-dwarf/test0.hash.abi | 4 +-
tests/data/test-read-dwarf/test1.abi | 4 +-
tests/data/test-read-dwarf/test1.hash.abi | 4 +-
.../test-read-dwarf/test10-pr18818-gcc.so.abi | 18 +-
.../test-read-dwarf/test11-pr18828.so.abi | 4 +-
.../test-read-dwarf/test12-pr18844.so.abi | 8 +-
.../test-read-dwarf/test13-pr18894.so.abi | 34 +--
.../test-read-dwarf/test14-pr18893.so.abi | 118 ++++----
.../test-read-dwarf/test15-pr18892.so.abi | 120 ++++----
.../test-read-dwarf/test16-pr18904.so.abi | 32 +--
.../test-read-dwarf/test17-pr19027.so.abi | 60 ++--
...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 48 ++--
...19-pr19023-libtcmalloc_and_profiler.so.abi | 74 ++---
tests/data/test-read-dwarf/test2.so.abi | 6 +-
tests/data/test-read-dwarf/test2.so.hash.abi | 6 +-
...st20-pr19025-libvtkParallelCore-6.1.so.abi | 26 +-
.../test-read-dwarf/test21-pr19092.so.abi | 86 +++---
.../test22-pr19097-libstdc++.so.6.0.17.so.abi | 256 +++++++++---------
tests/data/test-read-dwarf/test3.so.abi | 4 +-
tests/data/test-read-dwarf/test3.so.hash.abi | 4 +-
tests/data/test-read-dwarf/test4.so.abi | 4 +-
tests/data/test-read-dwarf/test4.so.hash.abi | 4 +-
tests/data/test-read-dwarf/test5.o.abi | 4 +-
tests/data/test-read-dwarf/test5.o.hash.abi | 4 +-
tests/data/test-read-dwarf/test6.so.abi | 4 +-
tests/data/test-read-dwarf/test6.so.hash.abi | 4 +-
tests/data/test-read-dwarf/test7.so.abi | 4 +-
tests/data/test-read-dwarf/test7.so.hash.abi | 4 +-
.../test8-qualified-this-pointer.so.abi | 4 +-
.../test8-qualified-this-pointer.so.hash.abi | 4 +-
.../test9-pr18818-clang.so.abi | 18 +-
tests/data/test-read-write/test0.xml | 2 +-
tests/data/test-read-write/test1.xml | 2 +-
tests/data/test-read-write/test10.xml | 2 +-
tests/data/test-read-write/test11.xml | 2 +-
tests/data/test-read-write/test12.xml | 2 +-
tests/data/test-read-write/test13.xml | 2 +-
tests/data/test-read-write/test14.xml | 2 +-
tests/data/test-read-write/test15.xml | 2 +-
tests/data/test-read-write/test16.xml | 2 +-
tests/data/test-read-write/test17.xml | 2 +-
tests/data/test-read-write/test18.xml | 2 +-
tests/data/test-read-write/test19.xml | 2 +-
tests/data/test-read-write/test2.xml | 2 +-
tests/data/test-read-write/test20.xml | 2 +-
tests/data/test-read-write/test21.xml | 2 +-
tests/data/test-read-write/test22.xml | 2 +-
tests/data/test-read-write/test23.xml | 2 +-
tests/data/test-read-write/test24.xml | 2 +-
tests/data/test-read-write/test25.xml | 2 +-
tests/data/test-read-write/test26.xml | 4 +-
tests/data/test-read-write/test27.xml | 4 +-
.../test28-without-std-fns-ref.xml | 4 +-
.../test28-without-std-vars-ref.xml | 4 +-
tests/data/test-read-write/test3.xml | 2 +-
tests/data/test-read-write/test4.xml | 2 +-
tests/data/test-read-write/test5.xml | 2 +-
tests/data/test-read-write/test6.xml | 2 +-
tests/data/test-read-write/test7.xml | 2 +-
tests/data/test-read-write/test8.xml | 2 +-
tests/data/test-read-write/test9.xml | 2 +-
tools/abidiff.cc | 38 +++
108 files changed, 1137 insertions(+), 960 deletions(-)
diff --git a/include/abg-corpus.h b/include/abg-corpus.h
index e60b5013..1f5c994e 100644
--- a/include/abg-corpus.h
+++ b/include/abg-corpus.h
@@ -57,6 +57,7 @@ private:
corpus();
void set_group(corpus_group*);
+ void init_format_version();
public:
shared_ptr<priv> priv_;
@@ -72,7 +73,7 @@ public:
get_environment();
void
- set_environment(environment*) const;
+ set_environment(environment*);
void
add(const translation_unit_sptr);
@@ -122,6 +123,18 @@ public:
void
set_origin(origin);
+ string&
+ get_format_major_version_number() const;
+
+ void
+ set_format_major_version_number(const string&);
+
+ string&
+ get_format_minor_version_number() const;
+
+ void
+ set_format_minor_version_number(const string&);
+
string&
get_path() const;
diff --git a/include/abg-ir.h b/include/abg-ir.h
index c32b2f7f..5a2aa6e3 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -24,6 +24,7 @@
#include "abg-fwd.h"
#include "abg-hash.h"
#include "abg-traverse.h"
+#include "abg-config.h"
/// @file
///
@@ -196,6 +197,9 @@ public:
interned_string
intern(const string&) const;
+ const config&
+ get_config() const;
+
friend class class_or_union;
friend class class_decl;
friend class function_type;
diff --git a/src/abg-config.cc b/src/abg-config.cc
index ac64c767..4063a79f 100644
--- a/src/abg-config.cc
+++ b/src/abg-config.cc
@@ -19,7 +19,7 @@ namespace abigail
{
config::config()
: m_format_minor("0"),
- m_format_major("1"),
+ m_format_major("2"),
m_xml_element_indent(2),
m_tu_instr_suffix(".bi"),
m_tu_instr_archive_suffix(".abi")
diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h
index a4a97adf..582c05ba 100644
--- a/src/abg-corpus-priv.h
+++ b/src/abg-corpus-priv.h
@@ -662,6 +662,9 @@ public:
/// The private data of the @ref corpus type.
struct corpus::priv
{
+ mutable unordered_map<string, type_base_sptr> canonical_types_;
+ string format_major_version_number_;
+ string format_minor_version_number_;
environment* env;
corpus_group* group;
corpus::exported_decls_builder_sptr exported_decls_builder;
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 2c37e253..4e445e88 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -466,7 +466,10 @@ corpus::priv::~priv()
///
/// @param path the path to the file containing the ABI corpus.
corpus::corpus(ir::environment* env, const string& path)
-{priv_.reset(new priv(path, env));}
+{
+ priv_.reset(new priv(path, env));
+ init_format_version();
+}
/// Getter of the enviroment of the corpus.
///
@@ -486,8 +489,11 @@ corpus::get_environment()
///
/// @param e the new environment.
void
-corpus::set_environment(environment* e) const
-{priv_->env = e;}
+corpus::set_environment(environment* e)
+{
+ priv_->env = e;
+ init_format_version();
+}
/// Add a translation unit to the current ABI Corpus. Next time
/// corpus::save is called, all the translation unit that got added to
@@ -692,6 +698,23 @@ void
corpus::set_group(corpus_group* g)
{priv_->group = g;}
+/// Initialize the abixml serialization format version number of the
+/// corpus.
+///
+/// This function sets the format version number ot the default one
+/// supported by the current version of Libabigail.
+void
+corpus::init_format_version()
+{
+ if (priv_->env)
+ {
+ set_format_major_version_number
+ (priv_->env->get_config().get_format_major_version_number());
+ set_format_minor_version_number
+ (priv_->env->get_config().get_format_minor_version_number());
+ }
+}
+
/// Getter for the origin of the corpus.
///
/// @return the origin of the corpus.
@@ -706,6 +729,40 @@ void
corpus::set_origin(origin o)
{priv_->origin_ = o;}
+/// Getter of the major version number of the abixml serialization
+/// format.
+///
+/// @return the major version number of the abixml format.
+string&
+corpus::get_format_major_version_number() const
+{return priv_->format_major_version_number_;}
+
+/// Setter of the major version number of the abixml serialization
+/// format.
+///
+/// @param maj the new major version numberof the abixml format.
+void
+corpus::set_format_major_version_number(const string& maj)
+{priv_->format_major_version_number_ = maj;}
+
+/// Getter of the minor version number of the abixml serialization
+/// format.
+///
+/// @return the minor version number of the abixml serialization
+/// format.
+string&
+corpus::get_format_minor_version_number() const
+{return priv_->format_minor_version_number_;}
+
+/// Setter of the minor version number of the abixml serialization
+/// format.
+///
+/// @param min the new minor version number of the abixml
+/// serialization format.
+void
+corpus::set_format_minor_version_number(const string& min)
+{priv_->format_minor_version_number_ = min;}
+
/// Get the file path associated to the corpus file.
///
/// A subsequent call to corpus::read will deserialize the content of
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index d1d02f3a..02f3cc24 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -2641,6 +2641,7 @@ typedef unordered_map<interned_string,
/// The private data of the @ref environment type.
struct environment::priv
{
+ config config_;
canonical_types_map_type canonical_types_;
mutable vector<type_base_sptr> sorted_canonical_types_;
type_base_sptr void_type_;
@@ -3043,6 +3044,13 @@ interned_string
environment::intern(const string& s) const
{return const_cast<environment*>(this)->priv_->string_pool_.create_string(s);}
+/// Getter of the general configuration object.
+///
+/// @return the configuration object.
+const config&
+environment::get_config() const
+{return priv_->config_;}
+
// </environment stuff>
// <type_or_decl_base stuff>
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index 1fb0cf7d..3e552864 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1768,6 +1768,38 @@ consider_types_not_reachable_from_public_interfaces(read_context& ctxt,
bool flag)
{ctxt.tracking_non_reachable_types(flag);}
+/// Read the "version" attribute from the current XML element which is
+/// supposed to be a corpus or a corpus group and set the format
+/// version to the corpus object accordingly.
+///
+/// Note that this is a subroutine of read_corpus_from_input and
+/// read_corpus_group_from_input.
+///
+/// @param reader the XML reader to consider. That reader must be
+/// set to an XML element representing a corpus or a corpus group.
+///
+/// @param corp output parameter. The corpus object which format
+/// version string is going to be set according to the value of the
+/// "version" attribute found on the current XML element.
+static void
+handle_version_attribute(xml::reader_sptr& reader, corpus& corp)
+{
+ string version_string;
+ if (xml_char_sptr s = XML_READER_GET_ATTRIBUTE(reader, "version"))
+ xml::xml_char_sptr_to_string(s, version_string);
+
+ vector<string> v;
+ if (version_string.empty())
+ {
+ v.push_back("1");
+ v.push_back("0");
+ }
+ else
+ tools_utils::split_string(version_string, ".", v);
+ corp.set_format_major_version_number(v[0]);
+ corp.set_format_minor_version_number(v[1]);
+}
+
/// Parse the input XML document containing an ABI corpus, represented
/// by an 'abi-corpus' element node, associated to the current
/// context.
@@ -1811,6 +1843,8 @@ read_corpus_from_input(read_context& ctxt)
corpus& corp = *ctxt.get_corpus();
ctxt.set_exported_decls_builder(corp.get_exported_decls_builder().get());
+ handle_version_attribute(reader, corp);
+
xml::xml_char_sptr path_str = XML_READER_GET_ATTRIBUTE(reader, "path");
string path;
@@ -2001,6 +2035,9 @@ read_corpus_group_from_input(read_context& ctxt)
}
corpus_group_sptr group = ctxt.get_corpus_group();
+
+ handle_version_attribute(reader, *group);
+
xml::xml_char_sptr path_str = XML_READER_GET_ATTRIBUTE(reader, "path");
if (path_str)
group->set_path(reinterpret_cast<char*>(path_str.get()));
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index d55bbbc1..4900703f 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -154,7 +154,6 @@ class write_context
{
const environment* m_env;
id_manager m_id_manager;
- config m_config;
ostream* m_ostream;
bool m_annotate;
bool m_show_locs;
@@ -217,7 +216,10 @@ public:
const config&
get_config() const
- {return m_config;}
+ {
+ ABG_ASSERT(get_environment());
+ return get_environment()->get_config();
+ }
/// Getter for the current ostream
///
@@ -2209,10 +2211,7 @@ write_translation_unit(write_context& ctxt,
do_indent(o, indent);
- o << "<abi-instr version='"
- << c.get_format_major_version_number()
- << "." << c.get_format_minor_version_number()
- << "'";
+ o << "<abi-instr";
if (tu.get_address_size() != 0)
o << " address-size='" << static_cast<int>(tu.get_address_size()) << "'";
@@ -4476,6 +4475,21 @@ write_corpus_to_archive(const corpus_sptr corp, const bool annotate)
#endif //WITH_ZIP_ARCHIVE
+/// Serialize the current version number of the ABIXML format.
+///
+/// @param ctxt the writing context to use.
+static void
+write_version_info(write_context& ctxt)
+{
+ ostream& o = ctxt.get_ostream();
+ const config& c = ctxt.get_config();
+
+ o << "version='"
+ << c.get_format_major_version_number()
+ << "." << c.get_format_minor_version_number()
+ << "'";
+}
+
/// Serialize an ABI corpus to a single native xml document. The root
/// note of the resulting XML document is 'abi-corpus'.
///
@@ -4506,7 +4520,9 @@ write_corpus(write_context& ctxt,
std::ostream& out = ctxt.get_ostream();
- out << "<abi-corpus";
+ out << "<abi-corpus ";
+
+ write_version_info(ctxt);
// For an abi-corpus as part of an abi-corpus group, only omit the path, but
// keep the filename.
@@ -4615,7 +4631,8 @@ write_corpus_group(write_context& ctxt,
std::ostream& out = ctxt.get_ostream();
- out << "<abi-corpus-group";
+ out << "<abi-corpus-group ";
+ write_version_info(ctxt);
if (!group->get_path().empty() && ctxt.get_write_corpus_path())
out << " path='" << xml::escape_xml_string(group->get_path()) << "'";
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 6b6dcbba..3b5c6035 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -15,7 +15,7 @@
<!-- _init -->
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
@@ -1198,7 +1198,7 @@
<!-- struct _IO_FILE -->
<class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-22'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- void emit(std::string&, std::string&) -->
<function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
<!-- parameter of type 'std::string&' -->
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index 7cae766a..33e45f16 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -17,7 +17,7 @@
<!-- _init -->
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 7cae766a..33e45f16 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -17,7 +17,7 @@
<!-- _init -->
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi
index 51d01dfc..3893c85f 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -1,9 +1,9 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-function-symbols>
<!-- foo(S&) -->
<elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test-anonymous-members-0.cc' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-annotate' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test-anonymous-members-0.cc' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-annotate' language='LANG_C_plus_plus'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- double -->
diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi
index c441710f..97aa4a2a 100644
--- a/tests/data/test-annotate/test0.abi
+++ b/tests/data/test-annotate/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -35,7 +35,7 @@
<!-- global -->
<elf-symbol name='global' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- int -->
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index d1481c65..8562fa74 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -59,7 +59,7 @@
<!-- _ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3 -->
<elf-symbol name='_ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- double -->
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index cad84c9b..ae62b7ac 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libdbus-1.so.3'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libdbus-1.so.3'>
<elf-needed>
<dependency name='librt.so.1'/>
<dependency name='libpthread.so.0'/>
@@ -474,7 +474,7 @@
<!-- dbus_watch_set_data -->
<elf-symbol name='dbus_watch_set_data' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- int -->
@@ -664,7 +664,7 @@
<return type-id='type-id-22'/>
</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'>
+ <abi-instr 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' 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'>
@@ -1197,7 +1197,7 @@
</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'>
+ <abi-instr 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-85' size-in-bits='320' id='type-id-84'>
<!-- <anonymous range>[10] -->
@@ -2386,7 +2386,7 @@
<!-- 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'>
+ <abi-instr 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-148'/>
<!-- const DBusError -->
@@ -2456,7 +2456,7 @@
<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'>
+ <abi-instr 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-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*) -->
@@ -2502,7 +2502,7 @@
<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'>
+ <abi-instr 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-152'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -3236,7 +3236,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<!-- void dbus_get_version(int*, int*, int*) -->
<function-decl name='dbus_get_version' mangled-name='dbus_get_version' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_get_version'>
<!-- parameter of type 'int*' -->
@@ -3254,7 +3254,7 @@
<return type-id='type-id-22'/>
</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'>
+ <abi-instr 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-142' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-89'/>
<!-- void (DBusPendingCall*, void*)* -->
@@ -3360,7 +3360,7 @@
<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'>
+ <abi-instr 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-159'>
<!-- <anonymous range>[16] -->
@@ -3646,7 +3646,7 @@
<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'>
+ <abi-instr 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-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;} -->
@@ -3771,7 +3771,7 @@
<return type-id='type-id-22'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<!-- dbus_bool_t dbus_validate_utf8(const char*, DBusError*) -->
<function-decl name='dbus_validate_utf8' mangled-name='dbus_validate_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_validate_utf8'>
<!-- parameter of type 'const char*' -->
@@ -3827,7 +3827,7 @@
<return type-id='type-id-17'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<!-- dbus_bool_t dbus_setenv(const char*, const char*) -->
<function-decl name='dbus_setenv' mangled-name='dbus_setenv' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_setenv'>
<!-- parameter of type 'const char*' -->
@@ -3838,7 +3838,7 @@
<return type-id='type-id-17'/>
</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'>
+ <abi-instr 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-183'/>
<!-- typedef __anonymous_struct__ DBusThreadFunctions -->
@@ -4043,7 +4043,7 @@
<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'>
+ <abi-instr 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-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*)* -->
@@ -4095,7 +4095,7 @@
<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'>
+ <abi-instr 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'>
<!-- 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**' -->
@@ -4117,7 +4117,7 @@
<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'>
+ <abi-instr 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-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*)* -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 89929ba2..f9eed018 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libGLU.so.1'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libGLU.so.1'>
<elf-needed>
<dependency name='libGL.so.1'/>
<dependency name='libstdc++.so.6'/>
@@ -126,7 +126,7 @@
<!-- gluUnProject4 -->
<elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- REAL[160] -->
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
<!-- <anonymous range>[160] -->
@@ -780,7 +780,7 @@
<!-- void* -->
<pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-25'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- struct GLUnurbs -->
<class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-42'>
<!-- class NurbsTessellator -->
@@ -4641,7 +4641,7 @@
<subrange length='16' type-id='type-id-3' id='type-id-227'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- GLfloat[4] -->
<array-type-def dimensions='1' type-id='type-id-32' size-in-bits='128' id='type-id-228'>
<!-- <anonymous range>[4] -->
@@ -4856,7 +4856,7 @@
<!-- GLfloat[4]* -->
<pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- GLint[2] -->
<array-type-def dimensions='1' type-id='type-id-63' size-in-bits='64' id='type-id-50'>
<!-- <anonymous range>[2] -->
@@ -5551,9 +5551,9 @@
<!-- struct SurfaceMap -->
<class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-143'/>
<!-- char*[32] -->
@@ -5825,7 +5825,7 @@
<!-- const int -->
<qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- REAL[4] -->
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
<!-- <anonymous range>[4] -->
@@ -6985,13 +6985,13 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- ArcTessellator* const -->
<qualified-type-def type-id='type-id-148' const='yes' id='type-id-277'/>
<!-- Pool* const -->
<qualified-type-def type-id='type-id-113' const='yes' id='type-id-278'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- REAL[3][4] -->
<array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
<!-- <anonymous range>[3] -->
@@ -7077,17 +7077,17 @@
<!-- GridVertex* -->
<pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/bin.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/bin.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Bin* const -->
<qualified-type-def type-id='type-id-151' const='yes' id='type-id-281'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Subdivider* const -->
<qualified-type-def type-id='type-id-123' const='yes' id='type-id-282'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- class Jarcloc -->
<class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
<data-member access='private' layout-offset-in-bits='0'>
@@ -7322,7 +7322,7 @@
<!-- Uarray* -->
<pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Quiltspec[2] -->
<array-type-def dimensions='1' type-id='type-id-189' size-in-bits='640' id='type-id-185'>
<!-- <anonymous range>[2] -->
@@ -7661,7 +7661,7 @@
<!-- Knotvector* -->
<pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- float[3] -->
<array-type-def dimensions='1' type-id='type-id-28' size-in-bits='96' id='type-id-248'>
<!-- <anonymous range>[3] -->
@@ -7672,11 +7672,11 @@
<!-- Curvelist* const -->
<qualified-type-def type-id='type-id-249' const='yes' id='type-id-300'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvesub.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curvesub.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Curvelist& -->
<qualified-type-def type-id='type-id-250' id='type-id-301'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- struct Dlnode -->
<class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
<!-- class PooledObj -->
@@ -7789,17 +7789,17 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Flist* const -->
<qualified-type-def type-id='type-id-155' const='yes' id='type-id-303'/>
<!-- FlistSorter* -->
<pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-177'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flistsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/flistsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- FlistSorter* const -->
<qualified-type-def type-id='type-id-177' const='yes' id='type-id-304'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- class Hull -->
<class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
<!-- class TrimRegion -->
@@ -7875,21 +7875,21 @@
<!-- Hull* const -->
<qualified-type-def type-id='type-id-197' const='yes' id='type-id-305'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Bin& -->
<qualified-type-def type-id='type-id-262' id='type-id-306'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Knotvector* -->
<pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
<!-- Knotvector* const -->
<qualified-type-def type-id='type-id-293' const='yes' id='type-id-307'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mapdesc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mapdesc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mapdescv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mapdescv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- class Maplist -->
<class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
<data-member access='private' layout-offset-in-bits='0'>
@@ -7929,7 +7929,7 @@
<!-- PooledObj* const -->
<qualified-type-def type-id='type-id-241' const='yes' id='type-id-309'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- GridTrimVertex*[2] -->
<array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
<!-- <anonymous range>[2] -->
@@ -8011,7 +8011,7 @@
<!-- const float -->
<qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Real[2] -->
<array-type-def dimensions='1' type-id='type-id-311' size-in-bits='64' id='type-id-312'>
<!-- <anonymous range>[2] -->
@@ -8196,9 +8196,9 @@
<!-- vertexArray* const -->
<qualified-type-def type-id='type-id-316' const='yes' id='type-id-327'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- struct O_pwlcurve -->
<class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
<!-- class PooledObj -->
@@ -8531,7 +8531,7 @@
<!-- Renderhints* -->
<pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Patchspec[2] -->
<array-type-def dimensions='1' type-id='type-id-274' size-in-bits='640' id='type-id-271'>
<!-- <anonymous range>[2] -->
@@ -8673,7 +8673,7 @@
<!-- Patchspec* const -->
<qualified-type-def type-id='type-id-332' const='yes' id='type-id-333'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Pspec[2] -->
<array-type-def dimensions='1' type-id='type-id-267' size-in-bits='512' id='type-id-257'>
<!-- <anonymous range>[2] -->
@@ -8684,17 +8684,17 @@
<!-- Patchlist* const -->
<qualified-type-def type-id='type-id-258' const='yes' id='type-id-334'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/quilt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/quilt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Flist& -->
<qualified-type-def type-id='type-id-295' id='type-id-335'/>
<!-- Quilt* const -->
<qualified-type-def type-id='type-id-120' const='yes' id='type-id-336'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Renderhints* const -->
<qualified-type-def type-id='type-id-129' const='yes' id='type-id-337'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- class rectBlock -->
<class-decl name='rectBlock' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/rectBlock.h' line='39' column='1' id='type-id-338'>
<data-member access='private' layout-offset-in-bits='0'>
@@ -8949,15 +8949,15 @@
<!-- rectBlockArray* const -->
<qualified-type-def type-id='type-id-345' const='yes' id='type-id-352'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Sorter* const -->
<qualified-type-def type-id='type-id-198' const='yes' id='type-id-353'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Patchlist& -->
<qualified-type-def type-id='type-id-259' id='type-id-354'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- struct Knotspec -->
<class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-355'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -9138,19 +9138,19 @@
<!-- Splinespec* const -->
<qualified-type-def type-id='type-id-361' const='yes' id='type-id-365'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/trimline.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/trimline.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Jarcloc* const -->
<qualified-type-def type-id='type-id-289' const='yes' id='type-id-366'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/trimvertpool.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/trimvertpool.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- TrimVertexPool* const -->
<qualified-type-def type-id='type-id-131' const='yes' id='type-id-367'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- Uarray* const -->
<qualified-type-def type-id='type-id-212' const='yes' id='type-id-368'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- REAL[1000] -->
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-369'>
<!-- <anonymous range>[1000] -->
@@ -9211,7 +9211,7 @@
<!-- long int* -->
<pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-375'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- short int -->
<type-decl name='short int' size-in-bits='16' id='type-id-376'/>
<!-- class sampledLine -->
@@ -9371,11 +9371,11 @@
<!-- sampledLine** -->
<pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-388'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/gridWrap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/gridWrap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- gridBoundaryChain* const -->
<qualified-type-def type-id='type-id-340' const='yes' id='type-id-389'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<!-- class monoChain -->
<class-decl name='monoChain' size-in-bits='640' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='41' column='1' id='type-id-390'>
<data-member access='private' layout-offset-in-bits='0'>
@@ -9462,23 +9462,23 @@
<!-- monoChain** -->
<pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-393'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoTriangulation.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/monoTriangulation.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/polyDBG.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/polyDBG.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleComp.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleComp.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompBot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompBot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompRight.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompRight.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompTop.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompTop.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleMonoPoly.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleMonoPoly.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- CachedVertex[100] -->
<array-type-def dimensions='1' type-id='type-id-394' size-in-bits='25600' id='type-id-395'>
<!-- <anonymous range>[100] -->
@@ -10289,7 +10289,7 @@
<!-- double -->
<type-decl name='double' size-in-bits='64' id='type-id-463'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- unsigned char -->
<type-decl name='unsigned char' size-in-bits='8' id='type-id-91'/>
<!-- unsigned int -->
@@ -10310,7 +10310,7 @@
<return type-id='type-id-466'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- int -->
<type-decl name='int' size-in-bits='32' id='type-id-11'/>
<!-- void -->
@@ -10477,7 +10477,7 @@
<return type-id='type-id-63'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- double -->
<type-decl name='double' size-in-bits='64' id='type-id-463'/>
<!-- typedef double GLdouble -->
@@ -10638,7 +10638,7 @@
<return type-id='type-id-12'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- typedef GLUquadric GLUquadric -->
<typedef-decl name='GLUquadric' type-id='type-id-472' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-473'/>
<!-- struct GLUquadric -->
@@ -10810,7 +10810,7 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<!-- const GLubyte* gluGetString(GLenum) -->
<function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
<!-- parameter of type 'typedef GLenum' -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 274aceb9..62a94355 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libtsan.so.0'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libtsan.so.0'>
<elf-needed>
<dependency name='librt.so.1'/>
<dependency name='libpthread.so.0'/>
@@ -3035,7 +3035,7 @@
<!-- __asan_cplus_demangle_operators -->
<elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.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 address-size='64' path='../../.././libsanitizer/interception/interception_linux.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'>
<!-- void* dlvsym(void*, const char*, const char*) -->
<function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
<!-- parameter of type 'void*' -->
@@ -3058,9 +3058,9 @@
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-5'/>
</abi-instr>
- <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 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'>
+ <abi-instr 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' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='55' column='1' id='type-id-6'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -3401,7 +3401,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.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'>
<!-- int dl_iterate_phdr(int (dl_phdr_info*, typedef size_t, void*)*, void*) -->
<function-decl name='dl_iterate_phdr' filepath='/usr/include/link.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
<!-- parameter of type 'int (dl_phdr_info*, typedef size_t, void*)*' -->
@@ -3425,7 +3425,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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'>
<!-- int __asan_backtrace_pcinfo(backtrace_state*, uintptr_t, backtrace_full_callback, backtrace_error_callback, void*) -->
<function-decl name='__asan_backtrace_pcinfo' mangled-name='__asan_backtrace_pcinfo' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_pcinfo'>
<!-- parameter of type 'backtrace_state*' -->
@@ -3487,7 +3487,7 @@
<!-- int* -->
<pointer-type-def type-id='type-id-25' 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'>
+ <abi-instr 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'>
<!-- 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-28'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -3545,7 +3545,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.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'>
<!-- typedef __off_t off_t -->
<typedef-decl name='off_t' type-id='type-id-43' filepath='/usr/include/sys/types.h' line='87' column='1' id='type-id-44'/>
<!-- typedef long int __off_t -->
@@ -3633,7 +3633,7 @@
<!-- long int -->
<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'>
+ <abi-instr 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'>
<!-- 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' -->
@@ -3678,7 +3678,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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'>
<!-- backtrace_state* __asan_backtrace_create_state(const char*, int, backtrace_error_callback, void*) -->
<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 of type 'const char*' -->
@@ -3693,7 +3693,7 @@
<return type-id='type-id-23'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.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'>
<!-- const demangle_builtin_type_info[33] -->
<array-type-def dimensions='1' type-id='type-id-48' size-in-bits='8448' id='type-id-49'>
<!-- <anonymous range>[33] -->
@@ -4376,9 +4376,9 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.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'>
<!-- __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>* const -->
<qualified-type-def type-id='type-id-91' const='yes' id='type-id-92'/>
<!-- __sanitizer::LowLevelAllocator* -->
@@ -4868,7 +4868,7 @@
<!-- long long unsigned int -->
<type-decl name='long long unsigned int' size-in-bits='64' id='type-id-161'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.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'>
<!-- AddressRange[6] -->
<array-type-def dimensions='1' type-id='type-id-162' size-in-bits='768' id='type-id-163'>
<!-- <anonymous range>[6] -->
@@ -5174,9 +5174,9 @@
<!-- const __sanitizer::InternalScopedBuffer<char> -->
<qualified-type-def type-id='type-id-189' const='yes' id='type-id-196'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.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/sanitizer_common/sanitizer_coverage.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.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'>
<!-- __sanitizer::InternalMmapVector<long unsigned int>* -->
<pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-198'/>
<!-- __sanitizer::InternalMmapVector<long unsigned int>* const -->
@@ -5331,9 +5331,9 @@
<!-- unsigned int* -->
<pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-219'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.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/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'>
+ <abi-instr 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 __sanitizer -->
<namespace-decl name='__sanitizer'>
<!-- bool __sanitizer::IsSpace(int) -->
@@ -5419,7 +5419,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.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'>
<!-- __sanitizer::LibIgnore* const -->
<qualified-type-def type-id='type-id-220' const='yes' id='type-id-221'/>
<!-- const __sanitizer::SuppressionContext& -->
@@ -5723,7 +5723,7 @@
</enum-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.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'>
<!-- char[256] -->
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='2048' id='type-id-246'>
<!-- <anonymous range>[256] -->
@@ -6256,7 +6256,7 @@
<!-- volatile __sanitizer::atomic_uint32_t::Type -->
<qualified-type-def type-id='type-id-287' volatile='yes' id='type-id-295'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.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'>
<!-- char[56] -->
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='448' id='type-id-296'>
<!-- <anonymous range>[56] -->
@@ -6395,14 +6395,14 @@
<!-- void** -->
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-312'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.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 -->
<namespace-decl name='__sanitizer'>
<!-- unsigned int __sanitizer::struct_statfs64_sz -->
<var-decl name='struct_statfs64_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer18struct_statfs64_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' line='63' column='1'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_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 -->
<namespace-decl name='__sanitizer'>
<!-- unsigned int __sanitizer::struct_utsname_sz -->
@@ -7479,7 +7479,7 @@
<var-decl name='sigset_t_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer11sigset_t_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='138' column='1'/>
</namespace-decl>
</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'>
+ <abi-instr 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 -->
<namespace-decl name='__sanitizer'>
<!-- void __sanitizer::UnmapOrDie(void*, __sanitizer::uptr) -->
@@ -7500,7 +7500,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.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'>
<!-- typedef unsigned int __uid_t -->
<typedef-decl name='__uid_t' type-id='type-id-211' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-313'/>
<!-- typedef unsigned long int pthread_t -->
@@ -7592,7 +7592,7 @@
<!-- typedef unsigned long int __rlim_t -->
<typedef-decl name='__rlim_t' type-id='type-id-33' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-321'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.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'>
<!-- __sanitizer::InternalScopedString* const -->
<qualified-type-def type-id='type-id-168' const='yes' id='type-id-322'/>
<!-- void (const char*)* -->
@@ -7617,7 +7617,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.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'>
<!-- unsigned long int[1] -->
<array-type-def dimensions='1' type-id='type-id-33' size-in-bits='64' id='type-id-325'>
<!-- <anonymous range>[1] -->
@@ -7845,11 +7845,11 @@
<return type-id='type-id-112'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.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/sanitizer_common/sanitizer_stacktrace_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.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/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.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'>
<!-- typedef __pid_t pid_t -->
<typedef-decl name='pid_t' type-id='type-id-352' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-353'/>
<!-- __sanitizer::InternalMmapVector<int>* const -->
@@ -8119,7 +8119,7 @@
<!-- const __sanitizer::InternalMmapVector<int>& -->
<reference-type-def kind='lvalue' type-id='type-id-382' size-in-bits='64' id='type-id-385'/>
</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'>
+ <abi-instr 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'>
<!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression>* const -->
<qualified-type-def type-id='type-id-240' const='yes' id='type-id-387'/>
<!-- __sanitizer::Suppression* const& -->
@@ -8157,7 +8157,7 @@
<!-- const __sanitizer::Suppression -->
<qualified-type-def type-id='type-id-243' const='yes' id='type-id-398'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.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'>
<!-- __sanitizer::Symbolizer* const -->
<qualified-type-def type-id='type-id-399' const='yes' id='type-id-400'/>
<!-- __sanitizer::Symbolizer* -->
@@ -8423,7 +8423,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.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'>
<!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
<typedef-decl name='demangle_callbackref' type-id='type-id-89' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-87'/>
<!-- typedef void (void*, const char*, int)* backtrace_error_callback -->
@@ -8480,9 +8480,9 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.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/sanitizer_common/sanitizer_symbolizer_posix_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.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'>
<!-- char[16384] -->
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='131072' id='type-id-415'>
<!-- <anonymous range>[16384] -->
@@ -8817,7 +8817,7 @@
<return type-id='type-id-112'/>
</function-type>
</abi-instr>
- <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 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'>
<!-- __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>* const -->
<qualified-type-def type-id='type-id-430' const='yes' id='type-id-431'/>
<!-- __sanitizer::ThreadContextBase* const -->
@@ -9017,7 +9017,7 @@
</enum-decl>
</namespace-decl>
</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'>
+ <abi-instr 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-25'/>
<!-- long long unsigned int -->
@@ -9231,7 +9231,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.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'>
<!-- namespace __sanitizer -->
<namespace-decl name='__sanitizer'>
<!-- __sanitizer::atomic_uint64_t::Type __sanitizer::atomic_fetch_sub<__sanitizer::atomic_uint64_t>(volatile __sanitizer::atomic_uint64_t*, __sanitizer::atomic_uint64_t::Type, __sanitizer::memory_order) -->
@@ -11396,7 +11396,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.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'>
<!-- __sanitizer::CommonFlags* -->
<pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-576'/>
<!-- bool* -->
@@ -11420,7 +11420,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.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'>
<!-- __tsan::IgnoreSet* const -->
<qualified-type-def type-id='type-id-492' const='yes' id='type-id-579'/>
<!-- const __tsan::IgnoreSet* const -->
@@ -11430,7 +11430,7 @@
<!-- const __tsan::IgnoreSet -->
<qualified-type-def type-id='type-id-471' const='yes' id='type-id-582'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.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'>
<!-- LibCodeRange[128] -->
<array-type-def dimensions='1' type-id='type-id-227' size-in-bits='16384' id='type-id-228'>
<!-- <anonymous range>[128] -->
@@ -27089,7 +27089,7 @@
<!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*> -->
<qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1442'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.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'>
<!-- unsigned short int -->
<type-decl name='unsigned short int' size-in-bits='16' id='type-id-279'/>
<!-- typedef __sanitizer::u16 uu16 -->
@@ -27232,7 +27232,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.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'>
<!-- char[128] -->
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='1024' id='type-id-1456'>
<!-- <anonymous range>[128] -->
@@ -27867,7 +27867,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.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'>
<!-- __int128 -->
<type-decl name='__int128' size-in-bits='128' id='type-id-1473'/>
<!-- SizeClassInfo[53] -->
@@ -31730,7 +31730,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.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 unsigned long int jptr -->
<typedef-decl name='jptr' type-id='type-id-33' filepath='../../.././libsanitizer/tsan/tsan_interface_java.h' line='33' column='1' id='type-id-1582'/>
<!-- __tsan::BlockDesc* -->
@@ -31924,7 +31924,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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'>
<!-- unsigned char[64] -->
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-1589'>
<!-- <anonymous range>[64] -->
@@ -31984,7 +31984,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.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'>
<!-- Header*[262144] -->
<array-type-def dimensions='1' type-id='type-id-115' size-in-bits='16777216' id='type-id-111'>
<!-- <anonymous range>[262144] -->
@@ -32421,7 +32421,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.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'>
<!-- __sanitizer::atomic_uintptr_t::Type* -->
<pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-1640'/>
<!-- __tsan::Backoff* -->
@@ -32570,13 +32570,13 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.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'>
<!-- __tsan::MutexSet* const -->
<qualified-type-def type-id='type-id-495' const='yes' id='type-id-1650'/>
<!-- const __tsan::MutexSet* const -->
<qualified-type-def type-id='type-id-1545' const='yes' id='type-id-1651'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_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'>
<!-- 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-316'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -32918,7 +32918,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_report.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'>
<!-- variadic parameter type -->
<type-decl name='variadic parameter type' id='type-id-1666'/>
<!-- __sanitizer::AnsiColorDecorator* -->
@@ -33702,7 +33702,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.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'>
<!-- char[431104] -->
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='3448832' id='type-id-1754'>
<!-- <anonymous range>[431104] -->
@@ -34474,7 +34474,7 @@
<!-- const __tsan::StackTrace -->
<qualified-type-def type-id='type-id-1790' const='yes' id='type-id-1794'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.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'>
<!-- const __tsan::SyncVar* const -->
<qualified-type-def type-id='type-id-1552' const='yes' id='type-id-1795'/>
<!-- namespace __tsan -->
@@ -34514,7 +34514,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.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'>
<!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression>* const -->
<qualified-type-def type-id='type-id-523' const='yes' id='type-id-1796'/>
<!-- __sanitizer::InternalScopedBuffer<__tsan::MutexSet>* -->
@@ -34781,7 +34781,7 @@
<!-- const __tsan::ScopedReport& -->
<reference-type-def kind='lvalue' type-id='type-id-1828' size-in-bits='64' id='type-id-1829'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.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'>
<!-- TraceHeader[256] -->
<array-type-def dimensions='1' type-id='type-id-1788' size-in-bits='5062656' id='type-id-1786'>
<!-- <anonymous range>[256] -->
@@ -35262,9 +35262,9 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.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'>
<!-- __sanitizer::InternalMmapVector<__sanitizer::Suppression*>* const -->
<qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1854'/>
<!-- __sanitizer::Suppression* const -->
@@ -35294,7 +35294,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.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'>
<!-- __sanitizer::AddressInfo& -->
<reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-1859'/>
<!-- __sanitizer::AddressInfo* -->
@@ -35645,7 +35645,7 @@
<var-decl name='col' type-id='type-id-25' 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'>
+ <abi-instr 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-25' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-352'/>
<!-- struct dl_phdr_info -->
@@ -35792,7 +35792,7 @@
<return type-id='type-id-45'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.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'>
<!-- __sanitizer::GenericScopedLock<__tsan::MBlock>* -->
<pointer-type-def type-id='type-id-1876' size-in-bits='64' id='type-id-1877'/>
<!-- __sanitizer::GenericScopedReadLock<__tsan::Mutex>* -->
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index a0bce9e2..cf85ca0f 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libharfbuzz.so.0'>
<elf-needed>
<dependency name='libglib-2.0.so.0'/>
<dependency name='libfreetype.so.6'/>
@@ -518,7 +518,7 @@
<!-- hb_version_string -->
<elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
@@ -996,7 +996,7 @@
<return type-id='type-id-13'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- const char*[8] -->
<array-type-def dimensions='1' type-id='type-id-31' size-in-bits='512' id='type-id-70'>
<!-- <anonymous range>[8] -->
@@ -2341,7 +2341,7 @@
<!-- typedef uint32_t hb_tag_t -->
<typedef-decl name='hb_tag_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-223'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- struct hb_utf_t<unsigned int, true> -->
<class-decl name='hb_utf_t<unsigned int, true>' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-224'/>
<!-- struct hb_utf_t<short unsigned int, true> -->
@@ -2730,7 +2730,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- char[1] -->
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-239'>
<!-- <anonymous range>[1] -->
@@ -2883,7 +2883,7 @@
<return type-id='type-id-131'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >[1] -->
<array-type-def dimensions='1' type-id='type-id-249' size-in-bits='32' id='type-id-250'>
<!-- <anonymous range>[1] -->
@@ -13738,7 +13738,7 @@
<subrange length='1' type-id='type-id-4' id='type-id-171'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- hb_font_t* const -->
<qualified-type-def type-id='type-id-143' const='yes' id='type-id-1120'/>
<!-- int* -->
@@ -14366,7 +14366,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- struct FT_FaceRec_ -->
<class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-1122'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -15179,7 +15179,7 @@
<!-- struct FT_SubGlyphRec_ -->
<class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- enum GUnicodeScript -->
<enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-1215'>
<underlying-type type-id='type-id-11'/>
@@ -15331,7 +15331,7 @@
<return type-id='type-id-116'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- BYTE[256] -->
<array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
<!-- <anonymous range>[256] -->
@@ -16650,7 +16650,7 @@
<!-- const OT::Supplier<OT::IntType<short unsigned int, 2u> > -->
<qualified-type-def type-id='type-id-1275' const='yes' id='type-id-1373'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- EntryExitRecord[1] -->
<array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
<!-- <anonymous range>[1] -->
@@ -26174,7 +26174,7 @@
<!-- void* (const hb_ot_shape_plan_t*)* -->
<pointer-type-def type-id='type-id-2358' size-in-bits='64' id='type-id-2348'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- feature_info_t[32] -->
<array-type-def dimensions='1' type-id='type-id-2359' size-in-bits='7168' id='type-id-2360'>
<!-- <anonymous range>[32] -->
@@ -26381,7 +26381,7 @@
<!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* const -->
<qualified-type-def type-id='type-id-2290' const='yes' id='type-id-2392'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
<reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-423'/>
<!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
@@ -26447,15 +26447,15 @@
<!-- const unsigned int* -->
<pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-2311'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- hb_mask_t[21] -->
<array-type-def dimensions='1' type-id='type-id-133' size-in-bits='672' id='type-id-2403'>
<!-- <anonymous range>[21] -->
@@ -26605,19 +26605,19 @@
<!-- would_substitute_feature_t* const -->
<qualified-type-def type-id='type-id-2421' const='yes' id='type-id-2422'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- char[8] -->
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-2346'>
<!-- <anonymous range>[8] -->
@@ -26887,7 +26887,7 @@
<return type-id='type-id-33'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- hb_tag_t* -->
<pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-1399'/>
<!-- hb_language_t hb_ot_tag_to_language(hb_tag_t) -->
@@ -26923,7 +26923,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- elt_t[2048] -->
<array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
<!-- <anonymous range>[2048] -->
@@ -27207,7 +27207,7 @@
<return type-id='type-id-28'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- hb_shape_plan_t* hb_shape_plan_get_empty() -->
<function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
<!-- hb_shape_plan_t* -->
@@ -27308,7 +27308,7 @@
<!-- const char* const -->
<qualified-type-def type-id='type-id-31' const='yes' id='type-id-2443'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- const char* const -->
<qualified-type-def type-id='type-id-31' const='yes' id='type-id-2443'/>
<!-- const char* const* -->
@@ -27369,7 +27369,7 @@
<return type-id='type-id-28'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<!-- hb_unicode_funcs_t* hb_unicode_funcs_get_empty() -->
<function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
<!-- hb_unicode_funcs_t* -->
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 1dcf4c97..11d0c845 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libvtkRenderingLIC-6.1.so.1'>
<elf-needed>
<dependency name='libvtkIOLegacy-6.1.so.1'/>
<dependency name='libvtkIOXML-6.1.so.1'/>
@@ -866,7 +866,7 @@
<!-- vtkSurfaceLICPainter_SC -->
<elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
@@ -5564,7 +5564,7 @@
<!-- vtkWeakPointer<vtkImageDataLIC2D>* -->
<pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- int[6] -->
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
<!-- <anonymous range>[6] -->
@@ -5690,7 +5690,7 @@
<return type-id='type-id-226'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- int[2] -->
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-338'>
<!-- <anonymous range>[2] -->
@@ -8330,11 +8330,11 @@
<!-- float* const -->
<qualified-type-def type-id='type-id-56' const='yes' id='type-id-497'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- vtkPixelTransfer::VTK_TT* -->
<pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- class vtkStructuredGridLIC2D -->
<class-decl name='vtkStructuredGridLIC2D' size-in-bits='1472' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.h' line='51' column='1' id='type-id-498'>
<!-- class vtkStructuredGridAlgorithm -->
@@ -8744,7 +8744,7 @@
<!-- class vtkStructuredGridAlgorithm -->
<class-decl name='vtkStructuredGridAlgorithm' visibility='default' is-declaration-only='yes' id='type-id-499'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- class vtkSurfaceLICComposite -->
<class-decl name='vtkSurfaceLICComposite' size-in-bits='3584' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.h' line='38' column='1' id='type-id-525'>
<!-- class vtkObject -->
@@ -10014,7 +10014,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- class vtkSurfaceLICDefaultPainter -->
<class-decl name='vtkSurfaceLICDefaultPainter' size-in-bits='1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.h' line='37' column='1' id='type-id-562'>
<!-- class vtkDefaultPainter -->
@@ -12511,7 +12511,7 @@
<!-- const vtkSmartPointerBase -->
<qualified-type-def type-id='type-id-624' const='yes' id='type-id-657'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- double[3] -->
<array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-590'>
<!-- <anonymous range>[3] -->
@@ -13860,7 +13860,7 @@
<!-- class vtkUniformVariables -->
<class-decl name='vtkUniformVariables' visibility='default' is-declaration-only='yes' id='type-id-798'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<!-- class vtkTextureIO -->
<class-decl name='vtkTextureIO' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.h' line='33' column='1' id='type-id-808'>
<member-function access='private' static='yes'>
@@ -13895,59 +13895,59 @@
</member-function>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_AAH -->
<var-decl name='vtkLineIntegralConvolution2D_AAH' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAH' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAH'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_AAV -->
<var-decl name='vtkLineIntegralConvolution2D_AAV' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAV' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAV'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_CE -->
<var-decl name='vtkLineIntegralConvolution2D_CE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_CE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_EE -->
<var-decl name='vtkLineIntegralConvolution2D_EE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_EE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_EE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_LIC0 -->
<var-decl name='vtkLineIntegralConvolution2D_LIC0' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LIC0' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LIC0'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_LICI -->
<var-decl name='vtkLineIntegralConvolution2D_LICI' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LICI' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LICI'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_LICN -->
<var-decl name='vtkLineIntegralConvolution2D_LICN' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LICN' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LICN'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkLineIntegralConvolution2D_VT -->
<var-decl name='vtkLineIntegralConvolution2D_VT' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_VT' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_VT'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkStructuredGridLIC2D_fs -->
<var-decl name='vtkStructuredGridLIC2D_fs' type-id='type-id-68' mangled-name='vtkStructuredGridLIC2D_fs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' line='9' column='1' elf-symbol-id='vtkStructuredGridLIC2D_fs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkSurfaceLICPainter_CE -->
<var-decl name='vtkSurfaceLICPainter_CE' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_CE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkSurfaceLICPainter_DCpy -->
<var-decl name='vtkSurfaceLICPainter_DCpy' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_DCpy' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_DCpy'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkSurfaceLICPainter_GeomFs -->
<var-decl name='vtkSurfaceLICPainter_GeomFs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomFs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomFs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkSurfaceLICPainter_GeomVs -->
<var-decl name='vtkSurfaceLICPainter_GeomVs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomVs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomVs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' language='LANG_C_plus_plus'>
<!-- const char* vtkSurfaceLICPainter_SC -->
<var-decl name='vtkSurfaceLICPainter_SC' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_SC' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_SC'/>
</abi-instr>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 0c5063b8..7cc6f1a8 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libtcmalloc_and_profiler.so.4'>
<elf-needed>
<dependency name='libunwind.so.8'/>
<dependency name='libpthread.so.0'/>
@@ -1576,9 +1576,9 @@
<!-- sys_alloc -->
<elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
+ <abi-instr address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
<!-- int RunningOnValgrind() -->
<function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='src/base/dynamic_annotations.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
<!-- int -->
@@ -1594,7 +1594,7 @@
<!-- int -->
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- unsigned char[16] -->
<array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-4'>
<!-- <anonymous range>[16] -->
@@ -2194,7 +2194,7 @@
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-65'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- typedef int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* ListAllProcessThreadsCallBack -->
<typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-66' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-67'/>
<!-- typedef __pid_t pid_t -->
@@ -2259,7 +2259,7 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
<namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
<!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_verbose -->
@@ -2299,7 +2299,7 @@
<!-- typedef int int32_t -->
<typedef-decl name='int32_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-76'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- AllocList*[30] -->
<array-type-def dimensions='1' type-id='type-id-77' size-in-bits='1920' id='type-id-78'>
<!-- <anonymous range>[30] -->
@@ -2533,7 +2533,7 @@
<!-- typedef long int int64_t -->
<typedef-decl name='int64_t' type-id='type-id-85' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-103'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- struct CycleClock -->
<class-decl name='CycleClock' size-in-bits='8' is-struct='yes' visibility='default' filepath='./src/base/cycleclock.h' line='79' column='1' id='type-id-104'/>
<!-- namespace base -->
@@ -2549,7 +2549,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- const base::internal::SpinLockWaitTransition -->
<qualified-type-def type-id='type-id-105' const='yes' id='type-id-106'/>
<!-- const base::internal::SpinLockWaitTransition* -->
@@ -2623,7 +2623,7 @@
<!-- const volatile Atomic32 -->
<qualified-type-def type-id='type-id-93' const='yes' id='type-id-110'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- char[10] -->
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='80' id='type-id-111'>
<!-- <anonymous range>[10] -->
@@ -2938,7 +2938,7 @@
<!-- const size_t -->
<qualified-type-def type-id='type-id-62' const='yes' id='type-id-117'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- base::VDSOInitHelper* -->
<pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
<!-- base::VDSOSupport* -->
@@ -3058,7 +3058,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- const int& -->
<reference-type-def kind='lvalue' type-id='type-id-144' size-in-bits='64' id='type-id-145'/>
<!-- const int32_t -->
@@ -3174,7 +3174,7 @@
<!-- typedef unsigned long int uintptr_t -->
<typedef-decl name='uintptr_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-156'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- namespace tcmalloc -->
<namespace-decl name='tcmalloc'>
<!-- uint64_t tcmalloc::metadata_system_bytes() -->
@@ -3198,7 +3198,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- class HeapLeakCheckerGlobalPrePost -->
<class-decl name='HeapLeakCheckerGlobalPrePost' size-in-bits='8' visibility='default' filepath='src/heap-checker-bcad.cc' line='60' column='1' id='type-id-157'>
<data-member access='private' static='yes'>
@@ -3231,7 +3231,7 @@
<!-- bool heap_leak_checker_bcad_variable -->
<var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-61' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- char[] -->
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='infinite' id='type-id-159'>
<!-- <anonymous range>[] -->
@@ -11970,7 +11970,7 @@
<!-- const __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
<qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1059'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- AddressMap<HeapProfileTable::AllocValue>* const -->
<qualified-type-def type-id='type-id-265' const='yes' id='type-id-275'/>
<!-- HeapProfileTable* const -->
@@ -13501,7 +13501,7 @@
<!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
<qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1138'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- struct HeapProfileEndWriter -->
<class-decl name='HeapProfileEndWriter' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-profiler.cc' line='593' column='1' id='type-id-1139'>
<member-function access='public' destructor='yes'>
@@ -13597,7 +13597,7 @@
<return type-id='type-id-60'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- char[200] -->
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='1600' id='type-id-1141'>
<!-- <anonymous range>[200] -->
@@ -13902,7 +13902,7 @@
<!-- tcmalloc::LogItem* -->
<pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1158'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- enum MallocExtension_Ownership -->
<enum-decl name='MallocExtension_Ownership' filepath='src/gperftools/malloc_extension_c.h' line='87' column='1' id='type-id-1161'>
<underlying-type type-id='type-id-89'/>
@@ -14024,7 +14024,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- typedef void (void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_PreMmapHook -->
<typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1163' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1164'/>
<!-- typedef int (void*, typedef size_t, int, int, int, typedef off_t, void**)* MallocHook_MmapReplacement -->
@@ -14725,7 +14725,7 @@
<!-- const base::internal::HookList<void (*)(const void*, size_t)> -->
<qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1231'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- pthread_key_t* -->
<pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
<!-- pthread_once_t* -->
@@ -14776,7 +14776,7 @@
<!-- typedef int pthread_once_t -->
<typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1234'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- class HugetlbSysAllocator -->
<class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-1236'>
<!-- class SysAllocator -->
@@ -14901,7 +14901,7 @@
<var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-65' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- HeapProfileBucket[20] -->
<array-type-def dimensions='1' type-id='type-id-212' size-in-bits='8960' id='type-id-197'>
<!-- <anonymous range>[20] -->
@@ -15425,7 +15425,7 @@
<return type-id='type-id-60'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- TCMalloc_PageMap3<35>* const -->
<qualified-type-def type-id='type-id-1280' const='yes' id='type-id-1281'/>
<!-- namespace tcmalloc -->
@@ -15508,7 +15508,7 @@
<!-- TCMalloc_PageMap3<35>::Node* -->
<pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-1285'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- typedef void (int, siginfo_t*, void*, void*)* ProfileHandlerCallback -->
<typedef-decl name='ProfileHandlerCallback' type-id='type-id-1286' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1287'/>
<!-- struct timer_id_holder -->
@@ -16488,7 +16488,7 @@
</data-member>
</union-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- ProfileData* const -->
<qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1387'/>
<!-- const ProfileData::Entry& -->
@@ -16784,7 +16784,7 @@
<!-- typedef long int __time_t -->
<typedef-decl name='__time_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1416'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- Slot[64] -->
<array-type-def dimensions='1' type-id='type-id-1405' size-in-bits='4096' id='type-id-1406'>
<!-- <anonymous range>[64] -->
@@ -17529,7 +17529,7 @@
<return type-id='type-id-1'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- base::RawPrinter* -->
<pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1429'/>
<!-- base::RawPrinter* const -->
@@ -17595,7 +17595,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- const double& -->
<qualified-type-def type-id='type-id-1434' id='type-id-1435'/>
<!-- namespace std -->
@@ -17622,7 +17622,7 @@
<!-- const double -->
<qualified-type-def type-id='type-id-2' const='yes' id='type-id-1436'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- tcmalloc::PageHeapAllocator<tcmalloc::Span>* const -->
<qualified-type-def type-id='type-id-1437' const='yes' id='type-id-1438'/>
<!-- namespace tcmalloc -->
@@ -17702,7 +17702,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> -->
<qualified-type-def type-id='type-id-1440' const='yes' id='type-id-1441'/>
<!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket>* -->
@@ -17883,7 +17883,7 @@
<subrange length='31' type-id='type-id-5' id='type-id-1461'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- namespace tcmalloc -->
<namespace-decl name='tcmalloc'>
<!-- namespace tcmalloc::commandlineflags -->
@@ -17952,7 +17952,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- namespace tcmalloc -->
<namespace-decl name='tcmalloc'>
<!-- namespace tcmalloc::commandlineflags -->
@@ -17969,7 +17969,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- class SymbolTable -->
<class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1462'>
<member-type access='private'>
@@ -18688,7 +18688,7 @@
<var-decl name='FLAGS_nosymbolize_pprof' type-id='type-id-65' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_nosymbolize_pprofE' visibility='default' filepath='src/symbolize.cc' line='70' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_nosymbolize_pprofE'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- SysAllocator*[2] -->
<array-type-def dimensions='1' type-id='type-id-966' size-in-bits='128' id='type-id-1541'>
<!-- <anonymous range>[2] -->
@@ -18933,7 +18933,7 @@
<!-- size_t TCMalloc_SystemTaken -->
<var-decl name='TCMalloc_SystemTaken' type-id='type-id-62' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- AtomicWord[8] -->
<array-type-def dimensions='1' type-id='type-id-922' size-in-bits='512' id='type-id-923'>
<!-- <anonymous range>[8] -->
@@ -24766,7 +24766,7 @@
<return type-id='type-id-58'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<!-- const tcmalloc::ThreadCache* const -->
<qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1766'/>
<!-- tcmalloc::PageHeapAllocator<tcmalloc::ThreadCache>* const -->
diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi
index cc40ccd0..e22fa04b 100644
--- a/tests/data/test-annotate/test2.so.abi
+++ b/tests/data/test-annotate/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -23,7 +23,7 @@
<!-- _init -->
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- int -->
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<!-- typedef unsigned char character -->
@@ -74,7 +74,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- struct second_type -->
<class-decl name='second_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='12' column='1' id='type-id-8'>
<data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 637253f2..25f3707c 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libvtkParallelCore-6.1.so.1'>
<elf-needed>
<dependency name='libvtkIOLegacy-6.1.so.1'/>
<dependency name='libvtkIOCore-6.1.so.1'/>
@@ -752,7 +752,7 @@
<!-- vtable for vtkCommunicator::Operation -->
<elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
@@ -7873,7 +7873,7 @@
<!-- void (void*, void*, int, int)* -->
<pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-544'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkDummyCommunicator -->
<class-decl name='vtkDummyCommunicator' size-in-bits='576' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.h' line='32' column='1' id='type-id-546'>
<!-- class vtkCommunicator -->
@@ -8006,7 +8006,7 @@
<!-- vtkDummyCommunicator* -->
<pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- struct vtkMultiProcessController -->
<class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
<!-- class vtkObject -->
@@ -11319,7 +11319,7 @@
<!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
<qualified-type-def type-id='type-id-720' const='yes' id='type-id-739'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkFieldDataSerializer -->
<class-decl name='vtkFieldDataSerializer' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.h' line='41' column='1' id='type-id-740'>
<!-- class vtkObject -->
@@ -11596,7 +11596,7 @@
<!-- class vtkStringArray -->
<class-decl name='vtkStringArray' visibility='default' is-declaration-only='yes' id='type-id-756'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkProcess -->
<class-decl name='vtkProcess' size-in-bits='512' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.h' line='44' column='1' id='type-id-591'>
<!-- class vtkObject -->
@@ -17835,7 +17835,7 @@
<!-- int* const -->
<qualified-type-def type-id='type-id-90' const='yes' id='type-id-1231'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- size_t[4] -->
<array-type-def dimensions='1' type-id='type-id-40' size-in-bits='256' id='type-id-451'>
<!-- <anonymous range>[4] -->
@@ -19213,7 +19213,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- const vtkProcess -->
<qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
<!-- const vtkProcess& -->
@@ -19223,7 +19223,7 @@
<!-- vtkProcess* const -->
<qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- const vtkProcessGroup -->
<qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
<!-- const vtkProcessGroup& -->
@@ -19271,7 +19271,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkSocketCommunicator -->
<class-decl name='vtkSocketCommunicator' size-in-bits='1088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='55' column='1' id='type-id-1286'>
<!-- class vtkCommunicator -->
@@ -22262,7 +22262,7 @@
<!-- class vtkSocket -->
<class-decl name='vtkSocket' visibility='default' is-declaration-only='yes' id='type-id-1521'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkSocketController -->
<class-decl name='vtkSocketController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.h' line='47' column='1' id='type-id-1549'>
<!-- struct vtkMultiProcessController -->
@@ -22509,7 +22509,7 @@
<!-- vtkSocketController* const -->
<qualified-type-def type-id='type-id-1550' const='yes' id='type-id-1552'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- class vtkSubCommunicator -->
<class-decl name='vtkSubCommunicator' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.h' line='52' column='1' id='type-id-1555'>
<!-- class vtkCommunicator -->
@@ -22666,7 +22666,7 @@
<!-- vtkSubCommunicator* -->
<pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<!-- int[20] -->
<array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1560'>
<!-- <anonymous range>[20] -->
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 4bf3a6c8..460bed11 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -889,9 +889,9 @@
<!-- vflag -->
<elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.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'>
+ <abi-instr address-size='64' path='../.././gcc/collect2-aix.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.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'>
+ <abi-instr address-size='64' path='../.././gcc/collect2.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'>
<!-- bool -->
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<!-- char -->
@@ -2994,7 +2994,7 @@
</data-member>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- enum __anonymous_enum__ -->
<enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
<underlying-type type-id='type-id-26'/>
@@ -3474,7 +3474,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- enum gt_types_enum -->
<enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
<underlying-type type-id='type-id-26'/>
@@ -4214,7 +4214,7 @@
<!-- alloc_zone tree_id_zone -->
<var-decl name='tree_id_zone' type-id='type-id-201' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- struct linemap_stats -->
<class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -4281,7 +4281,7 @@
<!-- location_t input_location -->
<var-decl name='input_location' type-id='type-id-75' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
</abi-instr>
- <abi-instr 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'>
+ <abi-instr address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- wchar_t -->
<type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
<!-- typedef int nl_item -->
@@ -4392,7 +4392,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- typedef void* iconv_t -->
<typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
<!-- const pretty_printer -->
@@ -4661,7 +4661,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- struct symbol_stack_entry -->
<class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -4993,7 +4993,7 @@
<return type-id='type-id-14'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.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'>
+ <abi-instr address-size='64' path='../.././gcc/vec.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'>
<!-- void* vec_gc_p_reserve(void*, int) -->
<function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
<!-- parameter of type 'void*' -->
@@ -5157,7 +5157,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<!-- char[31] -->
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-248'>
<!-- <anonymous range>[31] -->
@@ -5195,7 +5195,7 @@
<!-- const char bug_report_url[31] -->
<var-decl name='bug_report_url' type-id='type-id-254' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- const uchar** -->
<pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
<!-- void cpp_init_iconv(cpp_reader*) -->
@@ -6764,7 +6764,7 @@
<!-- typedef unsigned long int cpp_num_part -->
<typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-384'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- typedef void (cpp_reader*)* pragma_cb -->
<typedef-decl name='pragma_cb' type-id='type-id-330' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-388'/>
<!-- typedef cpp_options cpp_options -->
@@ -7094,7 +7094,7 @@
<return type-id='type-id-18'/>
</function-type>
</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'>
+ <abi-instr 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'>
<!-- bool cpp_error(cpp_reader*, int, const char*, ...) -->
<function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
<!-- parameter of type 'cpp_reader*' -->
@@ -7228,7 +7228,7 @@
<return type-id='type-id-51'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- typedef cpp_num cpp_num -->
<typedef-decl name='cpp_num' type-id='type-id-381' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-361'/>
<!-- struct cpp_num -->
@@ -7360,7 +7360,7 @@
<return type-id='type-id-361'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- char[256] -->
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-397'>
<!-- <anonymous range>[256] -->
@@ -7812,7 +7812,7 @@
<!-- struct __dirstream -->
<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'>
+ <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
<typedef-decl name='ht_cb' type-id='type-id-410' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-411'/>
<!-- int (cpp_reader*, typedef hashnode, void*)* -->
@@ -7882,7 +7882,7 @@
<!-- typedef ht hash_table -->
<typedef-decl name='hash_table' type-id='type-id-315' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-414'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- const unsigned char[256] -->
<array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-415'>
<!-- <anonymous range>[256] -->
@@ -7973,7 +7973,7 @@
<!-- unsigned char _cpp_trigraph_map[256] -->
<var-decl name='_cpp_trigraph_map' type-id='type-id-416' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- struct normalize_state -->
<class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-274'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -8196,7 +8196,7 @@
<return type-id='type-id-15'/>
</function-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'>
+ <abi-instr 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-162' size-in-bits='192' id='type-id-159'>
<!-- <anonymous range>[1] -->
@@ -8770,7 +8770,7 @@
<return type-id='type-id-18'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- struct _cpp_file -->
<class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-307'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -10782,7 +10782,7 @@
<!-- struct _cpp_strbuf -->
<class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-427'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- const deps -->
<qualified-type-def type-id='type-id-313' const='yes' id='type-id-438'/>
<!-- const deps* -->
@@ -10878,7 +10878,7 @@
<return type-id='type-id-18'/>
</function-decl>
</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'>
+ <abi-instr 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'>
<!-- hash_table* ht_create(unsigned int) -->
<function-decl name='ht_create' mangled-name='_Z9ht_createj' filepath='../.././libcpp/symtab.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_createj'>
<!-- parameter of type 'unsigned int' -->
@@ -10979,7 +10979,7 @@
<enumerator name='HT_ALLOC' value='1'/>
</enum-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'>
+ <abi-instr address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<!-- enum ht_lookup_option -->
<enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-440'>
<underlying-type type-id='type-id-26'/>
@@ -11077,7 +11077,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.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'>
+ <abi-instr address-size='64' path='../.././libiberty/argv.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 freeargv(char**) -->
<function-decl name='freeargv' mangled-name='freeargv' filepath='../.././libiberty/argv.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freeargv'>
<!-- parameter of type 'char**' -->
@@ -11164,7 +11164,7 @@
<return type-id='type-id-31'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.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'>
+ <abi-instr address-size='64' path='../.././libiberty/concat.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'>
<!-- char* concat_copy(char*, const char*, ...) -->
<function-decl name='concat_copy' mangled-name='concat_copy' filepath='../.././libiberty/concat.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='concat_copy'>
<!-- parameter of type 'char*' -->
@@ -11188,7 +11188,7 @@
<!-- char* libiberty_concat_ptr -->
<var-decl name='libiberty_concat_ptr' type-id='type-id-51' 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'>
+ <abi-instr address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- const demangle_builtin_type_info[33] -->
<array-type-def dimensions='1' type-id='type-id-441' size-in-bits='8448' id='type-id-442'>
<!-- <anonymous range>[33] -->
@@ -11779,7 +11779,7 @@
<return type-id='type-id-31'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- const demangler_engine[11] -->
<array-type-def dimensions='1' type-id='type-id-481' size-in-bits='2112' id='type-id-482'>
<!-- <anonymous range>[11] -->
@@ -11906,9 +11906,9 @@
<return type-id='type-id-51'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.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'>
+ <abi-instr address-size='64' path='../.././libiberty/filename_cmp.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.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'>
+ <abi-instr address-size='64' path='../.././libiberty/fopen_unlocked.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 unlock_stream(FILE*) -->
<function-decl name='unlock_stream' mangled-name='unlock_stream' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_stream'>
<!-- parameter of type 'FILE*' -->
@@ -11957,7 +11957,7 @@
<return type-id='type-id-89'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.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'>
+ <abi-instr address-size='64' path='../.././libiberty/getpwd.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'>
<!-- char* getcwd(char*, size_t) -->
<function-decl name='getcwd' filepath='/usr/include/unistd.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
<!-- parameter of type 'char*' -->
@@ -11968,7 +11968,7 @@
<return type-id='type-id-51'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- double -->
<type-decl name='double' size-in-bits='64' id='type-id-489'/>
<!-- size_t htab_size(htab_t) -->
@@ -12138,7 +12138,7 @@
<!-- htab_eq htab_eq_pointer -->
<var-decl name='htab_eq_pointer' type-id='type-id-232' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- void hex_init() -->
<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'>
<!-- void -->
@@ -12147,7 +12147,7 @@
<!-- const unsigned char _hex_value[256] -->
<var-decl name='_hex_value' type-id='type-id-415' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- const char* unix_lbasename(const char*) -->
<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'>
<!-- parameter of type 'const char*' -->
@@ -12163,7 +12163,7 @@
<return type-id='type-id-15'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.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'>
+ <abi-instr address-size='64' path='../.././libiberty/make-temp-file.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'>
<!-- char* choose_tmpdir() -->
<function-decl name='choose_tmpdir' mangled-name='choose_tmpdir' filepath='../.././libiberty/make-temp-file.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='choose_tmpdir'>
<!-- char* -->
@@ -12179,7 +12179,7 @@
<return type-id='type-id-18'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- md5_uint32[2] -->
<array-type-def dimensions='1' type-id='type-id-490' size-in-bits='64' id='type-id-491'>
<!-- <anonymous range>[2] -->
@@ -12294,7 +12294,7 @@
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.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'>
+ <abi-instr address-size='64' path='../.././libiberty/pex-common.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'>
<!-- struct pex_obj -->
<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'>
@@ -12628,7 +12628,7 @@
<return type-id='type-id-31'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
+ <abi-instr address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- typedef __anonymous_union__ __WAIT_STATUS -->
<typedef-decl name='__WAIT_STATUS' type-id='type-id-498' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-499'/>
<!-- union {wait* __uptr; int* __iptr;} -->
@@ -12877,7 +12877,7 @@
<return type-id='type-id-18'/>
</function-decl>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- const unsigned short int[256] -->
<array-type-def dimensions='1' type-id='type-id-508' size-in-bits='4096' id='type-id-509'>
<!-- <anonymous range>[256] -->
@@ -12897,7 +12897,7 @@
<!-- const unsigned char _sch_tolower[256] -->
<var-decl name='_sch_tolower' type-id='type-id-415' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- int __lxstat(int, const char*, stat*) -->
<function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
<!-- parameter of type 'int' -->
@@ -12910,11 +12910,11 @@
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.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'>
+ <abi-instr address-size='64' path='../.././libiberty/xexit.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 ()* _xexit_cleanup -->
<var-decl name='_xexit_cleanup' type-id='type-id-136' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
+ <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<!-- typedef __intptr_t intptr_t -->
<typedef-decl name='intptr_t' type-id='type-id-511' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-512'/>
<!-- typedef long int __intptr_t -->
@@ -12943,6 +12943,6 @@
<return type-id='type-id-14'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.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'>
+ <abi-instr address-size='64' path='../.././libiberty/xmemdup.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'>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi
index cbcb456d..ce8d4da5 100644
--- a/tests/data/test-annotate/test3.so.abi
+++ b/tests/data/test-annotate/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64' soname='test3.so.1'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='test3.so.1'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -16,7 +16,7 @@
<!-- foo__ -->
<elf-symbol name='foo__' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
+ <abi-instr address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
<!-- void -->
<type-decl name='void' id='type-id-1'/>
<!-- void __foo() -->
diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi
index f631f3b8..bc77a28f 100644
--- a/tests/data/test-annotate/test4.so.abi
+++ b/tests/data/test-annotate/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -6,7 +6,7 @@
<!-- cpy -->
<elf-symbol name='cpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
+ <abi-instr address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- unsigned int -->
diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi
index d042f206..3d958da4 100644
--- a/tests/data/test-annotate/test5.o.abi
+++ b/tests/data/test-annotate/test5.o.abi
@@ -1,9 +1,9 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-function-symbols>
<!-- bar(void*) -->
<elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
<!-- void -->
<type-decl name='void' id='type-id-1'/>
<!-- void* -->
diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi
index 99fe07be..d74b1736 100644
--- a/tests/data/test-annotate/test6.so.abi
+++ b/tests/data/test-annotate/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -23,7 +23,7 @@
<!-- B::foo()::a -->
<elf-symbol name='_ZZN1B3fooEvE1a' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- int -->
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<!-- struct B -->
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 014e7d2b..d37db76f 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -1,9 +1,9 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-function-symbols>
<!-- foo(S&) -->
<elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- char -->
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<!-- char*[7] -->
diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
index ff994fdf..927fa3e7 100644
--- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -13,7 +13,7 @@
<!-- _init -->
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<!-- int -->
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<!-- void -->
diff --git a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
index c9a7bc08..7e533391 100644
--- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
+++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='PR25409-librte_bus_dpaa.so.20.0' architecture='elf-amd-x86_64' soname='librte_bus_dpaa.so.20.0'>
+<abi-corpus version='2.0' path='PR25409-librte_bus_dpaa.so.20.0' architecture='elf-amd-x86_64' soname='librte_bus_dpaa.so.20.0'>
<elf-needed>
<dependency name='libm.so.6'/>
<dependency name='libdl.so.2'/>
@@ -114,7 +114,7 @@
<elf-symbol name='qm_channel_caam' size='2' version='DPDK_20.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='qm_channel_pool1' size='2' version='DPDK_20.0' is-default-version='yes' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
<type-decl name='unsigned short int' size-in-bits='16' id='type-id-3'/>
@@ -129,7 +129,7 @@
<var-decl name='fman_dealloc_bufs_mask_hi' type-id='type-id-8' mangled-name='fman_dealloc_bufs_mask_hi' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='26' column='1' elf-symbol-id='fman_dealloc_bufs_mask_hi@@DPDK_20.0'/>
<var-decl name='fman_dealloc_bufs_mask_lo' type-id='type-id-8' mangled-name='fman_dealloc_bufs_mask_lo' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/fman/fman.c' line='27' column='1' elf-symbol-id='fman_dealloc_bufs_mask_lo@@DPDK_20.0'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/fman_hw.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-10'/>
<array-type-def dimensions='1' type-id='type-id-11' size-in-bits='1024' id='type-id-12'>
<subrange length='16' type-id='type-id-10' id='type-id-13'/>
@@ -383,7 +383,7 @@
<return type-id='type-id-20'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/netcfg_layer.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/fman/netcfg_layer.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-37' size-in-bits='infinite' id='type-id-38'>
<subrange length='infinite' type-id='type-id-10' id='type-id-39'/>
</array-type-def>
@@ -415,7 +415,7 @@
<return type-id='type-id-20'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-42' size-in-bits='512' id='type-id-43'>
<subrange length='8' type-id='type-id-10' id='type-id-44'/>
</array-type-def>
@@ -775,12 +775,12 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/bman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<function-decl name='bman_thread_irq' mangled-name='bman_thread_irq' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/bman_driver.c' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bman_thread_irq@@DPDK_20.0'>
<return type-id='type-id-20'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-103'/>
<function-decl name='qman_reserve_fqid_range' mangled-name='qman_reserve_fqid_range' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qman_reserve_fqid_range@@DPDK_20.0'>
<parameter type-id='type-id-8' name='fqid' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/dpaa_alloc.c' line='38' column='1'/>
@@ -807,7 +807,7 @@
<return type-id='type-id-20'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-45' size-in-bits='2040' id='type-id-104'>
<subrange length='255' type-id='type-id-10' id='type-id-105'/>
</array-type-def>
@@ -3037,7 +3037,7 @@
<return type-id='type-id-20'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-347'/>
<var-decl name='qm_channel_pool1' type-id='type-id-5' mangled-name='qm_channel_pool1' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='18' column='1' elf-symbol-id='qm_channel_pool1@@DPDK_20.0'/>
<var-decl name='qm_channel_caam' type-id='type-id-5' mangled-name='qm_channel_caam' visibility='default' filepath='../../dpdk/drivers/bus/dpaa/base/qbman/qman_driver.c' line='19' column='1' elf-symbol-id='qm_channel_caam@@DPDK_20.0'/>
@@ -3056,7 +3056,7 @@
<return type-id='type-id-235'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../dpdk/drivers/bus/dpaa/dpaa_bus.c' comp-dir-path='/home/dmarchan/v19.11/build-clang-shared' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-348' size-in-bits='8192' id='type-id-349'>
<subrange length='64' type-id='type-id-10' id='type-id-350'/>
</array-type-def>
diff --git a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
index ba6f1b06..c44ddde9 100644
--- a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
+++ b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='/home/dodji/git/libabigail/fixes/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1' architecture='elf-amd-x86_64' soname='libvtkIOSQL-6.1.so.1'>
+<abi-corpus version='2.0' path='test0-pr19026-libvtkIOSQL-6.1.so.1' architecture='elf-amd-x86_64' soname='libvtkIOSQL-6.1.so.1'>
<elf-needed>
<dependency name='libvtkIOCore-6.1.so.1'/>
<dependency name='libvtksys-6.1.so.1'/>
@@ -321,7 +321,7 @@
<elf-symbol name='_ZTV24vtkTableToDatabaseWriter' size='584' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTV25vtkSQLDatabaseTableSource' size='632' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkDatabaseToTableReader.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkDatabaseToTableReader.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
@@ -5253,7 +5253,7 @@
<qualified-type-def type-id='type-id-474' const='yes' id='type-id-509'/>
<qualified-type-def type-id='type-id-476' const='yes' id='type-id-510'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<type-decl name='short int' size-in-bits='16' id='type-id-252'/>
<type-decl name='unsigned char' size-in-bits='8' id='type-id-251'/>
<class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1' id='type-id-511'>
@@ -6001,7 +6001,7 @@
</function-type>
<class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-563'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQueryToTable.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQueryToTable.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkRowQueryToTable' size-in-bits='1088' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkRowQueryToTable.h' line='44' column='1' id='type-id-570'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-96'/>
<data-member access='protected' layout-offset-in-bits='1024'>
@@ -6204,7 +6204,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabase.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabase.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLDatabaseSchema' size-in-bits='512' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.h' line='59' column='1' id='type-id-233'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-32'/>
<member-type access='private'>
@@ -7916,7 +7916,7 @@
<return type-id='type-id-38'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLDatabaseSchemaInternals' size-in-bits='384' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='36' column='1' id='type-id-281'>
<member-type access='private'>
<class-decl name='Statement' size-in-bits='192' is-struct='yes' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseSchema.cxx' line='39' column='1' id='type-id-284'>
@@ -10508,7 +10508,7 @@
<class-decl name='__normal_iterator<const vtkSQLDatabaseSchemaInternals::Table*, std::vector<vtkSQLDatabaseSchemaInternals::Table, std::allocator<vtkSQLDatabaseSchemaInternals::Table> > >' visibility='default' is-declaration-only='yes' id='type-id-843'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseTableSource.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseTableSource.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLDatabaseTableSource' size-in-bits='1280' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLDatabaseTableSource.h' line='37' column='1' id='type-id-844'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-96'/>
<member-type access='private'>
@@ -10789,14 +10789,14 @@
<class-decl name='vtkTable' visibility='default' is-declaration-only='yes' id='type-id-875'/>
<class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-869'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-234' const='yes' id='type-id-278'/>
<reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-248'/>
<pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-250'/>
<qualified-type-def type-id='type-id-548' const='yes' id='type-id-879'/>
<qualified-type-def type-id='type-id-46' const='yes' id='type-id-249'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteDatabase.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteDatabase.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLiteDatabase' size-in-bits='704' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteDatabase.h' line='55' column='1' id='type-id-880'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-31'/>
<member-type access='private'>
@@ -11002,7 +11002,7 @@
</namespace-decl>
<class-decl name='vtk_sqlite3' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-891'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLiteQuery' size-in-bits='896' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteQuery.h' line='53' column='1' id='type-id-892'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-234'/>
<data-member access='private' layout-offset-in-bits='640'>
@@ -11359,7 +11359,7 @@
</namespace-decl>
<class-decl name='vtk_sqlite3_stmt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-901'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteToTableReader.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteToTableReader.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkSQLiteToTableReader' size-in-bits='1152' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkSQLiteToTableReader.h' line='30' column='1' id='type-id-902'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-95'/>
<member-function access='protected' constructor='yes'>
@@ -11795,7 +11795,7 @@
<class-decl name='vtkDoubleArray' visibility='default' is-declaration-only='yes' id='type-id-960'/>
<class-decl name='vtkIntArray' visibility='default' is-declaration-only='yes' id='type-id-962'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToDatabaseWriter.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToDatabaseWriter.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkTableToDatabaseWriter' size-in-bits='1280' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToDatabaseWriter.h' line='33' column='1' id='type-id-973'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
<data-member access='protected' layout-offset-in-bits='1088'>
@@ -11909,7 +11909,7 @@
<qualified-type-def type-id='type-id-975' const='yes' id='type-id-977'/>
<class-decl name='vtkWriter' visibility='default' is-declaration-only='yes' id='type-id-974'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToSQLiteWriter.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToSQLiteWriter.cxx' comp-dir-path='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/spack-build/IO/SQL' language='LANG_C_plus_plus'>
<class-decl name='vtkTableToSQLiteWriter' size-in-bits='1344' visibility='default' filepath='/var/tmp/gamblin2/spack-stage/spack-stage-hrtRhh/VTK-6.1.0/IO/SQL/vtkTableToSQLiteWriter.h' line='29' column='1' id='type-id-980'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-973'/>
<data-member access='protected' layout-offset-in-bits='1280'>
diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi b/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi
index f9fa8e5a..17cdfaca 100644
--- a/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi
+++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='libtest48-soname-abixml-v0.so' architecture='elf-amd-x86_64' soname='test48-soname-abixml-v0'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='test48-soname-abixml-v0'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -7,7 +7,7 @@
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test48-soname-abixml-v0.c' comp-dir-path='/home/dodji/git/libabigail/suppress-file-abixml/tests/data/test-diff-suppr' language='LANG_C99'>
+ <abi-instr address-size='64' path='test48-soname-abixml-v0.c' comp-dir-path='/home/dodji/git/libabigail/suppress-file-abixml/tests/data/test-diff-suppr' language='LANG_C99'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<type-decl name='void' id='type-id-2'/>
<class-decl name='S' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/suppress-file-abixml/tests/data/test-diff-suppr/test48-soname-abixml-v0.c' line='1' column='1' id='type-id-3'>
diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi b/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi
index 060ceb4c..fd035400 100644
--- a/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi
+++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='libtest48-soname-abixml-v1.so' architecture='elf-amd-x86_64' soname='test48-soname-abixml-v1'>
+<abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='test48-soname-abixml-v1'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -7,7 +7,7 @@
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test48-soname-abixml-v1.c' comp-dir-path='/home/dodji/git/libabigail/suppress-file-abixml/tests/data/test-diff-suppr' language='LANG_C99'>
+ <abi-instr address-size='64' path='test48-soname-abixml-v1.c' comp-dir-path='/home/dodji/git/libabigail/suppress-file-abixml/tests/data/test-diff-suppr' language='LANG_C99'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' id='type-id-2'/>
<type-decl name='void' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index 1fc1578e..8e8178a9 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/PR22015-libboost_iostreams.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR22015-libboost_iostreams.so'>
<elf-needed>
<dependency name='build/cached/third_party/boost-1.60.0/libboost_system.so'/>
<dependency name='libm.so.6'/>
@@ -135,7 +135,7 @@
<elf-symbol name='_ZTSN5boost6detail17sp_counted_impl_pINS_9iostreams6detail20file_descriptor_implEEE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTSN5boost9exceptionE' size='19' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
@@ -3515,7 +3515,7 @@
<qualified-type-def type-id='type-id-282' const='yes' id='type-id-312'/>
<qualified-type-def type-id='type-id-291' const='yes' id='type-id-313'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-314'/>
<pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
<pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-289'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index a90c17df..d5d9ecf1 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/PR22122-libftdc.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR22122-libftdc.so'>
<elf-needed>
<dependency name='build/cached/third_party/s2/libs2.so'/>
<dependency name='build/cached/third_party/s2/util/math/libmath.so'/>
@@ -244,7 +244,7 @@
<elf-symbol name='_ZZN5mongo11BSONElementC1EvE11kEooElement' size='2' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/block_compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/block_compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='168' id='type-id-3'>
@@ -2440,7 +2440,7 @@
<class-decl name='__anonymous_struct__6' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-41' visibility='default' is-declaration-only='yes' id='type-id-43'/>
<qualified-type-def type-id='type-id-179' const='yes' id='type-id-183'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/collector.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/collector.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<typedef-decl name='clock_t' type-id='type-id-184' filepath='/usr/include/time.h' line='59' column='1' id='type-id-185'/>
<typedef-decl name='__clock_t' type-id='type-id-18' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-184'/>
<typedef-decl name='time_t' type-id='type-id-186' filepath='/usr/include/time.h' line='75' column='1' id='type-id-187'/>
@@ -2912,7 +2912,7 @@
<return type-id='type-id-30'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<typedef-decl name='is_not_reference_tag' type-id='type-id-233' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-234'/>
<typedef-decl name='uint32_t' type-id='type-id-23' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-235'/>
<typedef-decl name='uint64_t' type-id='type-id-24' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-236'/>
@@ -3289,7 +3289,7 @@
<class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/controller.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/controller.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='832' id='type-id-265'>
<subrange length='104' type-id='type-id-4' id='type-id-266'/>
</array-type-def>
@@ -3920,7 +3920,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/decompressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/decompressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-325'/>
<qualified-type-def type-id='type-id-131' const='yes' id='type-id-326'/>
<reference-type-def kind='lvalue' type-id='type-id-326' size-in-bits='64' id='type-id-327'/>
@@ -4215,7 +4215,7 @@
<class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-58'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_manager.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/file_manager.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='16' id='type-id-334'>
<subrange length='2' type-id='type-id-4' id='type-id-335'/>
</array-type-def>
@@ -4958,7 +4958,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_reader.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/file_reader.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='128' id='type-id-408'>
<subrange length='16' type-id='type-id-4' id='type-id-409'/>
</array-type-def>
@@ -5274,7 +5274,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='632' id='type-id-443'>
<subrange length='79' type-id='type-id-4' id='type-id-444'/>
</array-type-def>
@@ -5492,7 +5492,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='56' id='type-id-453'>
<subrange length='7' type-id='type-id-4' id='type-id-454'/>
</array-type-def>
@@ -5885,7 +5885,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/varint.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/ftdc/varint.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<namespace-decl name='mongo'>
<class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'/>
<class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-86'>
diff --git a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
index 5271d003..0c948194 100644
--- a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
+++ b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/PR24378-fn-is-not-scope.o'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR24378-fn-is-not-scope.o'>
<elf-function-symbols>
<elf-symbol name='_ZN4stac14buggy_functionEPFvPFfiiEE' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='dwarf_bug.cpp' comp-dir-path='/remote/users/lstacul' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='dwarf_bug.cpp' comp-dir-path='/remote/users/lstacul' language='LANG_C_plus_plus'>
<type-decl name='void' id='type-id-1'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
<namespace-decl name='stac'>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 254c3678..ed68bf68 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/PR25007-sdhci.ko'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR25007-sdhci.ko'>
<elf-function-symbols>
<elf-symbol name='__sdhci_add_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='__sdhci_read_caps' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -42,7 +42,7 @@
<elf-variable-symbols>
<elf-symbol name='__this_module' size='896' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
+ <abi-instr address-size='64' path='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
<type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-3'>
<subrange length='2' type-id='type-id-1' id='type-id-4'/>
@@ -11483,7 +11483,7 @@
<return type-id='type-id-225'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='drivers/mmc/host/sdhci.mod.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
+ <abi-instr address-size='64' path='drivers/mmc/host/sdhci.mod.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
<var-decl name='__this_module' type-id='type-id-475' mangled-name='__this_module' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common/drivers/mmc/host/sdhci.mod.c' line='11' column='1' elf-symbol-id='__this_module'/>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index 24e7feff..75280788 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0' soname='libgdbm.so.6'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0' soname='libgdbm.so.6'>
<elf-needed>
<dependency name='libc.so.6'/>
<dependency name='ld-linux-x86-64.so.2'/>
@@ -90,7 +90,7 @@
<elf-symbol name='gdbm_version' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='gdbm_version_number' size='12' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='base64.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='base64.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
<pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-5'/>
@@ -118,7 +118,7 @@
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-4'/>
<type-decl name='unsigned long int' size-in-bits='64' id='type-id-9'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='bucket.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='bucket.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_new_bucket' mangled-name='_gdbm_new_bucket' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/bucket.c' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_new_bucket'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/bucket.c' line='29' column='1'/>
<parameter type-id='type-id-11' name='bucket' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/bucket.c' line='29' column='1'/>
@@ -413,7 +413,7 @@
<subrange length='1' type-id='type-id-36' id='type-id-39'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='falloc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='falloc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_alloc' mangled-name='_gdbm_alloc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_alloc'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1'/>
<parameter type-id='type-id-8' name='num_bytes' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/falloc.c' line='52' column='1'/>
@@ -435,7 +435,7 @@
<pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-52'/>
<pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-53'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='findkey.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='findkey.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-54'/>
<function-decl name='gdbm_bucket_element_valid_p' mangled-name='gdbm_bucket_element_valid_p' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/findkey.c' line='26' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_bucket_element_valid_p'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/findkey.c' line='26' column='1'/>
@@ -464,7 +464,7 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='fullio.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='fullio.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_full_read' mangled-name='_gdbm_full_read' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_full_read'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='25' column='1'/>
<parameter type-id='type-id-30' name='buffer' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/fullio.c' line='25' column='1'/>
@@ -483,7 +483,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmclose.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmclose.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-36'/>
<array-type-def dimensions='1' type-id='type-id-35' size-in-bits='128' id='type-id-51'>
<subrange length='1' type-id='type-id-36' id='type-id-39'/>
@@ -759,7 +759,7 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmcount.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmcount.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<type-decl name='long long unsigned int' size-in-bits='64' id='type-id-59'/>
<typedef-decl name='gdbm_count_t' type-id='type-id-59' filepath='./gdbm.h' line='88' column='1' id='type-id-60'/>
<pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-61'/>
@@ -769,7 +769,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmdelete.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmdelete.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<typedef-decl name='datum' type-id='type-id-56' filepath='./gdbm.h' line='95' column='1' id='type-id-55'/>
<class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-55' visibility='default' filepath='./gdbm.h' line='91' column='1' id='type-id-56'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -785,7 +785,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmdump.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmdump.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-31' size-in-bits='8' id='type-id-62'>
<subrange length='1' type-id='type-id-36' id='type-id-39'/>
</array-type-def>
@@ -915,7 +915,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmerrno.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmerrno.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-53'/>
<function-decl name='gdbm_errno_location' mangled-name='gdbm_errno_location' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmerrno.c' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_errno_location'>
<return type-id='type-id-53'/>
@@ -955,14 +955,14 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmexists.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmexists.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_exists' mangled-name='gdbm_exists' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexists.c' line='29' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_exists'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexists.c' line='29' column='1'/>
<parameter type-id='type-id-55' name='key' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexists.c' line='29' column='1'/>
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmexp.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmexp.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_export_to_file' mangled-name='gdbm_export_to_file' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexp.c' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_export_to_file'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexp.c' line='33' column='1'/>
<parameter type-id='type-id-79' name='fp' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmexp.c' line='33' column='1'/>
@@ -976,20 +976,20 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmfdesc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmfdesc.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_fdesc' mangled-name='gdbm_fdesc' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfdesc.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_fdesc'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfdesc.c' line='28' column='1'/>
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmfetch.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmfetch.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_fetch' mangled-name='gdbm_fetch' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfetch.c' line='30' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_fetch'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfetch.c' line='30' column='1'/>
<parameter type-id='type-id-55' name='key' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmfetch.c' line='30' column='1'/>
<return type-id='type-id-55'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmimp.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmimp.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_import_from_file' mangled-name='gdbm_import_from_file' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmimp.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_import_from_file'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmimp.c' line='28' column='1'/>
<parameter type-id='type-id-79' name='fp' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmimp.c' line='28' column='1'/>
@@ -1003,7 +1003,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmload.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmload.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-80' size-in-bits='256' id='type-id-81'>
<subrange length='2' type-id='type-id-36' id='type-id-82'/>
</array-type-def>
@@ -1100,7 +1100,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmopen.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmopen.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-88'/>
<pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-52'/>
<function-decl name='gdbm_avail_table_valid_p' mangled-name='gdbm_avail_table_valid_p' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmopen.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_avail_table_valid_p'>
@@ -1150,13 +1150,13 @@
<return type-id='type-id-12'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmreorg.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmreorg.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_reorganize' mangled-name='gdbm_reorganize' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmreorg.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_reorganize'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmreorg.c' line='32' column='1'/>
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmseq.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmseq.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_firstkey' mangled-name='gdbm_firstkey' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmseq.c' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_firstkey'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmseq.c' line='98' column='1'/>
<return type-id='type-id-55'/>
@@ -1167,7 +1167,7 @@
<return type-id='type-id-55'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmsetopt.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmsetopt.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_setopt' mangled-name='gdbm_setopt' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsetopt.c' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_setopt'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsetopt.c' line='333' column='1'/>
<parameter type-id='type-id-8' name='optflag' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsetopt.c' line='333' column='1'/>
@@ -1176,7 +1176,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmstore.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmstore.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_store' mangled-name='gdbm_store' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmstore.c' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_store'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmstore.c' line='40' column='1'/>
<parameter type-id='type-id-55' name='key' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmstore.c' line='40' column='1'/>
@@ -1185,13 +1185,13 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='gdbmsync.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='gdbmsync.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='gdbm_sync' mangled-name='gdbm_sync' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsync.c' line='28' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_sync'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmsync.c' line='28' column='1'/>
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hash.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='hash.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_hash' mangled-name='_gdbm_hash' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/hash.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_hash'>
<parameter type-id='type-id-55' name='key' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/hash.c' line='31' column='1'/>
<return type-id='type-id-8'/>
@@ -1210,7 +1210,7 @@
<return type-id='type-id-12'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='lock.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='lock.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_unlock_file' mangled-name='_gdbm_unlock_file' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/lock.c' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_unlock_file'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/lock.c' line='60' column='1'/>
<return type-id='type-id-12'/>
@@ -1220,7 +1220,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='mmap.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='mmap.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<typedef-decl name='ssize_t' type-id='type-id-89' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-90'/>
<typedef-decl name='__ssize_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='193' column='1' id='type-id-89'/>
<function-decl name='_gdbm_file_size' mangled-name='_gdbm_file_size' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/mmap.c' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_file_size'>
@@ -1270,7 +1270,7 @@
<return type-id='type-id-8'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='recover.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='recover.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<type-decl name='variadic parameter type' id='type-id-91'/>
<typedef-decl name='gdbm_recovery' type-id='type-id-92' filepath='./gdbm.h' line='157' column='1' id='type-id-93'/>
<class-decl name='gdbm_recovery_s' size-in-bits='704' is-struct='yes' visibility='default' filepath='./gdbm.h' line='137' column='1' id='type-id-92'>
@@ -1333,7 +1333,7 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='update.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='update.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<function-decl name='_gdbm_end_update' mangled-name='_gdbm_end_update' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/update.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_gdbm_end_update'>
<parameter type-id='type-id-10' name='dbf' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/update.c' line='62' column='1'/>
<return type-id='type-id-8'/>
@@ -1344,7 +1344,7 @@
<return type-id='type-id-12'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='version.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
+ <abi-instr address-size='64' path='version.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
<qualified-type-def type-id='type-id-8' const='yes' id='type-id-97'/>
<pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-98'/>
<function-decl name='gdbm_version_cmp' mangled-name='gdbm_version_cmp' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/version.c' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gdbm_version_cmp'>
diff --git a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
index 5e0ae2a7..a0b7a819 100644
--- a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
+++ b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/PR26261/PR26261-exe'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/PR26261/PR26261-exe'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -16,7 +16,7 @@
<elf-variable-symbols>
<elf-symbol name='_IO_stdin_used' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='PR26261-main.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
+ <abi-instr address-size='64' path='PR26261-main.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
<function-decl name='wrapped_call' mangled-name='wrapped_call' filepath='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261/PR26261-main.c' line='18' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wrapped_call'>
@@ -40,7 +40,7 @@
<return type-id='type-id-6'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='PR26261-obja.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
+ <abi-instr address-size='64' path='PR26261-obja.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
<type-decl name='int' size-in-bits='32' id='type-id-5'/>
<type-decl name='void' id='type-id-6'/>
<class-decl name='SA' size-in-bits='192' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261/PR26261-obja.h' line='5' column='1' id='type-id-8'>
@@ -63,7 +63,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='PR26261-objb.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
+ <abi-instr address-size='64' path='PR26261-objb.c' comp-dir-path='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261' language='LANG_C89'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<class-decl name='SB' size-in-bits='128' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/patches/tests/data/test-read-dwarf/PR26261/PR26261-objb.h' line='3' column='1' id='type-id-12'>
<data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index 29e70595..ec22d3dd 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/libtest23.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/libtest23.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -11,7 +11,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
@@ -730,7 +730,7 @@
</function-decl>
<class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-22'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
<parameter type-id='type-id-72' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
<parameter type-id='type-id-72' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
index ec67f013..f684a988 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/libtest24-drop-fns.so'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -11,7 +11,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
index 98b691bb..e39813a6 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/libtest24-drop-fns.so'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -11,7 +11,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
index 867fe229..6bb57df6 100644
--- a/tests/data/test-read-dwarf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test-PR26568-1.o'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test-PR26568-1.o'>
<elf-function-symbols>
<elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test-PR26568-1.c' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf' language='LANG_C89'>
+ <abi-instr address-size='64' path='test-PR26568-1.c' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf' language='LANG_C89'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<type-decl name='long int' size-in-bits='64' id='type-id-2'/>
<type-decl name='void' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
index c6eda38e..86ba8826 100644
--- a/tests/data/test-read-dwarf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test-PR26568-2.o'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test-PR26568-2.o'>
<elf-function-symbols>
<elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test-PR26568-2.c' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf' language='LANG_C89'>
+ <abi-instr address-size='64' path='test-PR26568-2.c' comp-dir-path='/home/dodji/git/libabigail/fixes/tests/data/test-read-dwarf' language='LANG_C89'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<type-decl name='long int' size-in-bits='64' id='type-id-2'/>
<type-decl name='void' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 776260b1..0ee423dc 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test-libandroid.so' soname='libandroid.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test-libandroid.so' soname='libandroid.so'>
<elf-needed>
<dependency name='liblog.so'/>
<dependency name='libhidlbase.so'/>
@@ -302,7 +302,7 @@
<elf-symbol name='android_setprocnetwork' version='LIBANDROID' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='android_setsocknetwork' version='LIBANDROID' is-default-version='yes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/libs/storage/IMountService.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/libs/storage/IMountService.cpp' language='LANG_C_plus_plus_14'>
<array-type-def dimensions='1' type-id='801a266d' size-in-bits='560' id='5da7196d'>
<subrange length='35' type-id='7ff19f0f' id='6e6845b5'/>
</array-type-def>
@@ -2407,7 +2407,7 @@
<typedef-decl name='AStorageManager_obbCallbackFunc' type-id='238ccd13' filepath='frameworks/native/include/android/storage_manager.h' line='123' column='1' id='9299e4b4'/>
<pointer-type-def type-id='f521429f' size-in-bits='32' id='238ccd13'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/libs/storage/IObbActionListener.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/libs/storage/IObbActionListener.cpp' language='LANG_C_plus_plus_14'>
<array-type-def dimensions='1' type-id='801a266d' size-in-bits='608' id='19b37a54'>
<subrange length='38' type-id='7ff19f0f' id='aa4ccdac'/>
</array-type-def>
@@ -2582,11 +2582,11 @@
</namespace-decl>
<reference-type-def kind='lvalue' type-id='f7c5ae1e' size-in-bits='32' id='bb0185f0'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/libs/storage/ObbInfo.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/libs/storage/ObbInfo.cpp' language='LANG_C_plus_plus_14'>
<qualified-type-def type-id='65c10d3d' const='yes' id='dda33994'/>
<pointer-type-def type-id='dda33994' size-in-bits='32' id='a5f3e61a'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/asset_manager.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/asset_manager.cpp' language='LANG_C_plus_plus_14'>
<type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='7ff19f0f'/>
<array-type-def dimensions='1' type-id='1b3b87e1' size-in-bits='512' id='224e4514'>
<subrange length='16' type-id='7ff19f0f' id='848d0938'/>
@@ -17011,7 +17011,7 @@
<pointer-type-def type-id='0efd2e9e' size-in-bits='32' id='88faef04'/>
<qualified-type-def type-id='0efd2e9e' const='yes' id='96cd7851'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/choreographer.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/choreographer.cpp' language='LANG_C_plus_plus_14'>
<typedef-decl name='intmax_t' type-id='9da381c4' filepath='bionic/libc/include/stdint.h' line='104' column='1' id='e104d842'/>
<typedef-decl name='imaxdiv_t' type-id='cdd897ad' filepath='bionic/libc/include/inttypes.h' line='255' column='1' id='5c0b4dc9'/>
<typedef-decl name='uintmax_t' type-id='9c313c2d' filepath='bionic/libc/include/stdint.h' line='103' column='1' id='f8b828c9'/>
@@ -18100,13 +18100,13 @@
<return type-id='48b5725f'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/configuration.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/configuration.cpp' language='LANG_C_plus_plus_14'>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/hardware_buffer_jni.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/hardware_buffer_jni.cpp' language='LANG_C_plus_plus_14'>
<pointer-type-def type-id='4d45f31e' size-in-bits='32' id='cdc60214'/>
<class-decl name='AHardwareBuffer' is-struct='yes' visibility='default' is-declaration-only='yes' id='4d45f31e'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/input.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/input.cpp' language='LANG_C_plus_plus_14'>
<pointer-type-def type-id='2a632eb8' size-in-bits='32' id='3fc367ce'/>
<qualified-type-def type-id='f4d8c12c' const='yes' id='ae051203'/>
<pointer-type-def type-id='ae051203' size-in-bits='32' id='1afb968b'/>
@@ -18140,13 +18140,13 @@
<class-decl name='Vector<android::PointerProperties>' visibility='default' is-declaration-only='yes' id='dd52783e'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/looper.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/looper.cpp' language='LANG_C_plus_plus_14'>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/native_activity.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/native_activity.cpp' language='LANG_C_plus_plus_14'>
<pointer-type-def type-id='67c862fe' size-in-bits='32' id='37fc1694'/>
<class-decl name='ANativeActivity' is-struct='yes' visibility='default' is-declaration-only='yes' id='67c862fe'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/native_window_jni.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/native_window_jni.cpp' language='LANG_C_plus_plus_14'>
<array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='infinite' id='1fdc7fa6'>
<subrange length='infinite' type-id='7ff19f0f' id='031f2035'/>
</array-type-def>
@@ -18457,7 +18457,7 @@
<return type-id='48b5725f'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/net.c' language='LANG_C99'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/net.c' language='LANG_C99'>
<pointer-type-def type-id='ea86de29' size-in-bits='32' id='354f7eb9'/>
<pointer-type-def type-id='002ac4a6' size-in-bits='32' id='cf536864'/>
<function-decl name='resNetworkResult' filepath='system/netd/include/NetdClient.h' line='55' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -18479,7 +18479,7 @@
<return type-id='48b5725f'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/obb.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/obb.cpp' language='LANG_C_plus_plus_14'>
<class-decl name='AObbInfo' size-in-bits='288' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/obb.cpp' line='26' column='1' id='3e61dcc9'>
<base-class access='public' layout-offset-in-bits='0' type-id='c02827ab'/>
</class-decl>
@@ -18489,7 +18489,7 @@
<class-decl name='ObbFile' visibility='default' is-declaration-only='yes' id='c02827ab'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/sensor.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/sensor.cpp' language='LANG_C_plus_plus_14'>
<reference-type-def kind='lvalue' type-id='3ebd995d' size-in-bits='32' id='ce4b3039'/>
<pointer-type-def type-id='3ebd995d' size-in-bits='32' id='da4b431d'/>
<reference-type-def kind='lvalue' type-id='c9173ef1' size-in-bits='32' id='be4d238d'/>
@@ -18540,7 +18540,7 @@
<class-decl name='SensorEventQueue' visibility='default' is-declaration-only='yes' id='3ebd995d'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/sharedmem.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/sharedmem.cpp' language='LANG_C_plus_plus_14'>
<class-decl name='__anonymous_struct__' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='frameworks/base/native/android/sharedmem.cpp' line='37' column='1' id='cdd897ae'>
<member-function access='public'>
<function-decl name='operator()' mangled-name='_ZZL7jniInitP7_JNIEnvENK3$_0clES0_' filepath='frameworks/base/native/android/sharedmem.cpp' line='37' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -18756,7 +18756,7 @@
<return type-id='95e97e5e'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/storage_manager.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/storage_manager.cpp' language='LANG_C_plus_plus_14'>
<class-decl name='AStorageManager' size-in-bits='352' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='62' column='1' id='56516754'>
<base-class access='public' layout-offset-in-bits='0' type-id='12f619c0'/>
<data-member access='protected' layout-offset-in-bits='64'>
@@ -19921,7 +19921,7 @@
<return type-id='48b5725f'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/surface_control.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/surface_control.cpp' language='LANG_C_plus_plus_14'>
<array-type-def dimensions='1' type-id='0ac54e8c' size-in-bits='512' id='0b1b1d03'>
<subrange length='4' type-id='7ff19f0f' id='16fe7105'/>
</array-type-def>
@@ -33093,7 +33093,7 @@
<qualified-type-def type-id='523e1257' const='yes' id='7cfd2f36'/>
<qualified-type-def type-id='9c8ba24a' const='yes' id='d42b1915'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/surface_texture.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/surface_texture.cpp' language='LANG_C_plus_plus_14'>
<class-decl name='ASurfaceTexture' size-in-bits='64' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_texture.cpp' line='32' column='1' id='8602fa1e'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='consumer' type-id='dc2c2b34' visibility='default' filepath='frameworks/base/native/android/surface_texture.cpp' line='33' column='1'/>
@@ -33199,7 +33199,7 @@
<class-decl name='SurfaceTexture' visibility='default' is-declaration-only='yes' id='cc9b054a'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/system_fonts.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/system_fonts.cpp' language='LANG_C_plus_plus_14'>
<type-decl name='unnamed-enum-underlying-type-16' is-anonymous='yes' size-in-bits='16' alignment-in-bits='16' id='20b16ce8'/>
<type-decl name='unnamed-enum-underlying-type-8' is-anonymous='yes' size-in-bits='8' alignment-in-bits='8' id='4aba8549'/>
<class-decl name='_xmlDoc' size-in-bits='768' is-struct='yes' visibility='default' filepath='external/libxml2/include/libxml/tree.h' line='551' column='1' id='226f124f'>
@@ -36950,7 +36950,7 @@
<class-decl name='_xmlNs' is-struct='yes' visibility='default' is-declaration-only='yes' id='d9290684'/>
<class-decl name='hb_font_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='4847a5be'/>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/base/native/android/trace.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/base/native/android/trace.cpp' language='LANG_C_plus_plus_14'>
<function-decl name='atrace_begin_body' filepath='system/core/libcutils/include/cutils/trace.h' line='169' column='1' visibility='default' binding='global' size-in-bits='32'>
<parameter type-id='80f4b756'/>
<return type-id='48b5725f'/>
@@ -36974,7 +36974,7 @@
<return type-id='48b5725f'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/native/libs/nativewindow/AHardwareBuffer.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/native/libs/nativewindow/AHardwareBuffer.cpp' language='LANG_C_plus_plus_14'>
<array-type-def dimensions='1' type-id='8f92235e' size-in-bits='256' id='2f8b211b'>
<subrange length='8' type-id='7ff19f0f' id='56e0c0b1'/>
</array-type-def>
@@ -37478,6 +37478,6 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='32' path='frameworks/native/libs/nativewindow/ANativeWindow.cpp' language='LANG_C_plus_plus_14'>
+ <abi-instr address-size='32' path='frameworks/native/libs/nativewindow/ANativeWindow.cpp' language='LANG_C_plus_plus_14'>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi
index 1204139e..d708d8c1 100644
--- a/tests/data/test-read-dwarf/test0.abi
+++ b/tests/data/test-read-dwarf/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test0'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test0'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -22,7 +22,7 @@
<elf-symbol name='_IO_stdin_used' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='global' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' id='type-id-2'/>
<type-decl name='long int' size-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test0.hash.abi b/tests/data/test-read-dwarf/test0.hash.abi
index c380c80b..2dfdf314 100644
--- a/tests/data/test-read-dwarf/test0.hash.abi
+++ b/tests/data/test-read-dwarf/test0.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test0'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test0'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -22,7 +22,7 @@
<elf-symbol name='_IO_stdin_used' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='global' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='a84c031d'/>
<type-decl name='int' size-in-bits='32' id='95e97e5e'/>
<type-decl name='long int' size-in-bits='64' id='bd54fe1a'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index 6ca36ea6..1dd31730 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test1'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -34,7 +34,7 @@
<elf-symbol name='_ZTVN10__cxxabiv117__class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='double' size-in-bits='64' id='type-id-2'/>
<type-decl name='int' size-in-bits='32' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi
index aa344d4d..b13336a0 100644
--- a/tests/data/test-read-dwarf/test1.hash.abi
+++ b/tests/data/test-read-dwarf/test1.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test1'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -34,7 +34,7 @@
<elf-symbol name='_ZTVN10__cxxabiv117__class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='a84c031d'/>
<type-decl name='double' size-in-bits='64' id='a0eb0f08'/>
<type-decl name='int' size-in-bits='32' id='95e97e5e'/>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index c6fa1034..d4c24a87 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test10-pr18818-gcc.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test10-pr18818-gcc.so'>
<elf-needed>
<dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
<dependency name='librt.so.1'/>
@@ -410,7 +410,7 @@
<elf-symbol name='_ZTVN5boost6system12system_errorE' size='40' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
@@ -2376,7 +2376,7 @@
<class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-245'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-247' size-in-bits='infinite' id='type-id-248'>
<subrange length='infinite' id='type-id-24'/>
</array-type-def>
@@ -5532,7 +5532,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-636'/>
<pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-637'/>
<qualified-type-def type-id='type-id-93' const='yes' id='type-id-236'/>
@@ -5657,7 +5657,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-657'>
<member-type access='public'>
<union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-658'>
@@ -5828,7 +5828,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<function-decl name='operator!=<char, std::char_traits<char>, std::allocator<char> >' mangled-name='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
<parameter type-id='type-id-613' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
@@ -5865,7 +5865,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-614'/>
<qualified-type-def type-id='type-id-358' const='yes' id='type-id-632'/>
<qualified-type-def type-id='type-id-694' id='type-id-695'/>
@@ -5895,7 +5895,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='unsigned char' size-in-bits='8' id='type-id-696'/>
<pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-698'/>
<reference-type-def kind='lvalue' type-id='type-id-42' size-in-bits='64' id='type-id-699'/>
@@ -6114,6 +6114,6 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 1aa056ef..a3edbd1b 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test11-pr18828.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test11-pr18828.so'>
<elf-needed>
<dependency name='build/debug/mongo/db/libserver_parameters.so'/>
<dependency name='build/debug/mongo/libbase.so'/>
@@ -633,7 +633,7 @@
<elf-symbol name='_ZTVN5mongo23ExportedServerParameterIiEE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN5mongo36ExportedScramIterationCountParameterE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/auth/sasl_options.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/auth/sasl_options.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='112' id='type-id-2'>
<subrange length='14' type-id='type-id-3' id='type-id-4'/>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 81dac4ee..409993e3 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test12-pr18844.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test12-pr18844.so'>
<elf-needed>
<dependency name='build/debug/mongo/bson/mutable/libmutable_bson.so'/>
<dependency name='build/debug/mongo/bson/util/libbson_extract.so'/>
@@ -1719,7 +1719,7 @@
<elf-symbol name='_ZTVSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE' size='56' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/replication_executor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/repl/replication_executor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='112' id='type-id-2'>
<subrange length='14' type-id='type-id-3' id='type-id-4'/>
@@ -25428,7 +25428,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3847'/>
<reference-type-def kind='lvalue' type-id='type-id-3847' size-in-bits='64' id='type-id-3776'/>
<qualified-type-def type-id='type-id-3742' const='yes' id='type-id-3848'/>
@@ -25587,7 +25587,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-3895' size-in-bits='64' id='type-id-3890'/>
<reference-type-def kind='lvalue' type-id='type-id-3810' size-in-bits='64' id='type-id-3809'/>
<reference-type-def kind='lvalue' type-id='type-id-3719' size-in-bits='64' id='type-id-3916'/>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index 5efa92d3..d078079b 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test13-pr18894.so' soname='libdbus-1.so.3'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test13-pr18894.so' soname='libdbus-1.so.3'>
<elf-needed>
<dependency name='librt.so.1'/>
<dependency name='libpthread.so.0'/>
@@ -240,7 +240,7 @@
<elf-symbol name='dbus_watch_handle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='dbus_watch_set_data' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' id='type-id-2'/>
<type-decl name='unsigned int' size-in-bits='32' id='type-id-3'/>
@@ -362,7 +362,7 @@
<return type-id='type-id-22'/>
</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'>
+ <abi-instr 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' 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'/>
@@ -709,7 +709,7 @@
</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'>
+ <abi-instr 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-85' size-in-bits='320' id='type-id-84'>
<subrange length='10' type-id='type-id-43' id='type-id-86'/>
</array-type-def>
@@ -1414,7 +1414,7 @@
<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'>
+ <abi-instr 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-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'/>
@@ -1454,7 +1454,7 @@
<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'>
+ <abi-instr 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-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'/>
@@ -1481,7 +1481,7 @@
<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'>
+ <abi-instr 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-152'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='gp_offset' type-id='type-id-3' visibility='default'/>
@@ -1906,7 +1906,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<function-decl name='dbus_get_version' mangled-name='dbus_get_version' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_get_version'>
<parameter type-id='type-id-24' name='major_version_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1'/>
<parameter type-id='type-id-24' name='minor_version_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='162' column='1'/>
@@ -1917,7 +1917,7 @@
<return type-id='type-id-22'/>
</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'>
+ <abi-instr 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-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'>
@@ -1977,7 +1977,7 @@
<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'>
+ <abi-instr 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-159'>
<subrange length='16' type-id='type-id-43' id='type-id-160'/>
</array-type-def>
@@ -2153,7 +2153,7 @@
<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'>
+ <abi-instr 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-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'>
@@ -2228,7 +2228,7 @@
<return type-id='type-id-22'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<function-decl name='dbus_validate_utf8' mangled-name='dbus_validate_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_validate_utf8'>
<parameter type-id='type-id-15' name='alleged_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1'/>
<parameter type-id='type-id-21' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='290' column='1'/>
@@ -2260,14 +2260,14 @@
<return type-id='type-id-17'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
+ <abi-instr address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
<function-decl name='dbus_setenv' mangled-name='dbus_setenv' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_setenv'>
<parameter type-id='type-id-15' name='varname' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1'/>
<parameter type-id='type-id-15' name='value' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='115' column='1'/>
<return type-id='type-id-17'/>
</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'>
+ <abi-instr 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-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'>
@@ -2395,7 +2395,7 @@
<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'>
+ <abi-instr 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-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'>
@@ -2425,7 +2425,7 @@
<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'>
+ <abi-instr 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-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'/>
@@ -2438,7 +2438,7 @@
<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'>
+ <abi-instr 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-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'>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index b16f72dd..58a3a0d5 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test14-pr18893.so' soname='libGLU.so.1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test14-pr18893.so' soname='libGLU.so.1'>
<elf-needed>
<dependency name='libGL.so.1'/>
<dependency name='libstdc++.so.6'/>
@@ -67,7 +67,7 @@
<elf-symbol name='gluUnProject' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
<subrange length='160' type-id='type-id-3' id='type-id-4'/>
</array-type-def>
@@ -488,7 +488,7 @@
<pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-23'/>
<pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-25'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-42'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-43'/>
<data-member access='public' layout-offset-in-bits='47616'>
@@ -3055,7 +3055,7 @@
<subrange length='16' type-id='type-id-3' id='type-id-227'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-32' size-in-bits='128' id='type-id-228'>
<subrange length='4' type-id='type-id-3' id='type-id-65'/>
</array-type-def>
@@ -3207,7 +3207,7 @@
</class-decl>
<pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-63' size-in-bits='64' id='type-id-50'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
@@ -3657,9 +3657,9 @@
<pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-237'/>
<class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='type-id-143'/>
<array-type-def dimensions='1' type-id='type-id-111' size-in-bits='2048' id='type-id-110'>
<subrange length='32' type-id='type-id-3' id='type-id-144'/>
@@ -3842,7 +3842,7 @@
<pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-112'/>
<qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
<subrange length='4' type-id='type-id-3' id='type-id-65'/>
</array-type-def>
@@ -4610,11 +4610,11 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-148' const='yes' id='type-id-277'/>
<qualified-type-def type-id='type-id-113' const='yes' id='type-id-278'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
<subrange length='3' type-id='type-id-3' id='type-id-68'/>
<subrange length='4' type-id='type-id-3' id='type-id-65'/>
@@ -4669,15 +4669,15 @@
<qualified-type-def type-id='type-id-188' const='yes' id='type-id-280'/>
<pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/bin.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/bin.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-151' const='yes' id='type-id-281'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-123' const='yes' id='type-id-282'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
<data-member access='private' layout-offset-in-bits='0'>
<var-decl name='arc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
@@ -4837,7 +4837,7 @@
<qualified-type-def type-id='type-id-194' const='yes' id='type-id-290'/>
<pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-189' size-in-bits='640' id='type-id-185'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
@@ -5068,17 +5068,17 @@
<pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-299'/>
<pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-28' size-in-bits='96' id='type-id-248'>
<subrange length='3' type-id='type-id-3' id='type-id-68'/>
</array-type-def>
<pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-249'/>
<qualified-type-def type-id='type-id-249' const='yes' id='type-id-300'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvesub.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/curvesub.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-250' id='type-id-301'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
<data-member access='public' layout-offset-in-bits='0'>
@@ -5152,14 +5152,14 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-155' const='yes' id='type-id-303'/>
<pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-177'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flistsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/flistsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-177' const='yes' id='type-id-304'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
<base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
<member-type access='private'>
@@ -5211,18 +5211,18 @@
<pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-197'/>
<qualified-type-def type-id='type-id-197' const='yes' id='type-id-305'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-262' id='type-id-306'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
<qualified-type-def type-id='type-id-293' const='yes' id='type-id-307'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mapdesc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mapdesc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mapdescv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mapdescv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
<data-member access='private' layout-offset-in-bits='0'>
<var-decl name='mapdescPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
@@ -5249,7 +5249,7 @@
<qualified-type-def type-id='type-id-106' const='yes' id='type-id-308'/>
<qualified-type-def type-id='type-id-241' const='yes' id='type-id-309'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
@@ -5303,7 +5303,7 @@
<qualified-type-def type-id='type-id-182' const='yes' id='type-id-310'/>
<qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-311' size-in-bits='64' id='type-id-312'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
@@ -5424,9 +5424,9 @@
<pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-316'/>
<qualified-type-def type-id='type-id-316' const='yes' id='type-id-327'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
<data-member access='public' layout-offset-in-bits='0'>
@@ -5653,7 +5653,7 @@
<pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
<pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-274' size-in-bits='640' id='type-id-271'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
@@ -5748,21 +5748,21 @@
<pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-332'/>
<qualified-type-def type-id='type-id-332' const='yes' id='type-id-333'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-267' size-in-bits='512' id='type-id-257'>
<subrange length='2' type-id='type-id-3' id='type-id-64'/>
</array-type-def>
<pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-258'/>
<qualified-type-def type-id='type-id-258' const='yes' id='type-id-334'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/quilt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/quilt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-295' id='type-id-335'/>
<qualified-type-def type-id='type-id-120' const='yes' id='type-id-336'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-129' const='yes' id='type-id-337'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='rectBlock' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/rectBlock.h' line='39' column='1' id='type-id-338'>
<data-member access='private' layout-offset-in-bits='0'>
<var-decl name='upGridLineIndex' type-id='type-id-313' visibility='default' filepath='libnurbs/nurbtess/rectBlock.h' line='40' column='1'/>
@@ -5928,13 +5928,13 @@
<pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-345'/>
<qualified-type-def type-id='type-id-345' const='yes' id='type-id-352'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-198' const='yes' id='type-id-353'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-259' id='type-id-354'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-355'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='order' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
@@ -6061,16 +6061,16 @@
<pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
<qualified-type-def type-id='type-id-361' const='yes' id='type-id-365'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/trimline.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/trimline.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-289' const='yes' id='type-id-366'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/trimvertpool.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/trimvertpool.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-131' const='yes' id='type-id-367'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-212' const='yes' id='type-id-368'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-369'>
<subrange length='1000' type-id='type-id-3' id='type-id-370'/>
</array-type-def>
@@ -6111,7 +6111,7 @@
<qualified-type-def type-id='type-id-373' const='yes' id='type-id-374'/>
<pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-375'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<type-decl name='short int' size-in-bits='16' id='type-id-376'/>
<class-decl name='sampledLine' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/sampledLine.h' line='38' column='1' id='type-id-377'>
<data-member access='private' layout-offset-in-bits='0'>
@@ -6215,10 +6215,10 @@
<qualified-type-def type-id='type-id-378' const='yes' id='type-id-387'/>
<pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-388'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/gridWrap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/gridWrap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-340' const='yes' id='type-id-389'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
<class-decl name='monoChain' size-in-bits='640' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='41' column='1' id='type-id-390'>
<data-member access='private' layout-offset-in-bits='0'>
<var-decl name='chainHead' type-id='type-id-380' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='42' column='1'/>
@@ -6279,23 +6279,23 @@
<qualified-type-def type-id='type-id-391' const='yes' id='type-id-392'/>
<pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-393'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoTriangulation.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/monoTriangulation.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/polyDBG.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/polyDBG.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleComp.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleComp.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompBot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompBot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompRight.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompRight.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleCompTop.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleCompTop.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampleMonoPoly.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampleMonoPoly.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-394' size-in-bits='25600' id='type-id-395'>
<subrange length='100' type-id='type-id-3' id='type-id-396'/>
</array-type-def>
@@ -6823,7 +6823,7 @@
<typedef-decl name='GLdouble' type-id='type-id-463' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-397'/>
<type-decl name='double' size-in-bits='64' id='type-id-463'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<type-decl name='unsigned char' size-in-bits='8' id='type-id-91'/>
<type-decl name='unsigned int' size-in-bits='32' id='type-id-92'/>
<typedef-decl name='GLubyte' type-id='type-id-91' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-464'/>
@@ -6835,7 +6835,7 @@
<return type-id='type-id-466'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<type-decl name='int' size-in-bits='32' id='type-id-11'/>
<type-decl name='void' id='type-id-12'/>
<typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-63'/>
@@ -6923,7 +6923,7 @@
<return type-id='type-id-63'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<type-decl name='double' size-in-bits='64' id='type-id-463'/>
<typedef-decl name='GLdouble' type-id='type-id-463' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-397'/>
<typedef-decl name='GLclampd' type-id='type-id-463' filepath='../../../include/GL/gl.h' line='163' column='1' id='type-id-468'/>
@@ -7008,7 +7008,7 @@
<return type-id='type-id-12'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<typedef-decl name='GLUquadric' type-id='type-id-472' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-473'/>
<class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-472'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -7107,7 +7107,7 @@
<return type-id='type-id-12'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+ <abi-instr address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
<function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
<parameter type-id='type-id-59' name='name' filepath='libutil/registry.c' line='44' column='1'/>
<return type-id='type-id-466'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index dd370815..42dd9331 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test15-pr18892.so' soname='libtsan.so.0'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test15-pr18892.so' soname='libtsan.so.0'>
<elf-needed>
<dependency name='librt.so.1'/>
<dependency name='libpthread.so.0'/>
@@ -1524,7 +1524,7 @@
<elf-symbol name='__asan_cplus_demangle_builtin_types' size='1056' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.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 address-size='64' path='../../.././libsanitizer/interception/interception_linux.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'>
<function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-1'/>
<parameter type-id='type-id-2'/>
@@ -1537,9 +1537,9 @@
<type-decl name='void' id='type-id-4'/>
<type-decl name='char' size-in-bits='8' id='type-id-5'/>
</abi-instr>
- <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 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'>
+ <abi-instr 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' 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'/>
@@ -1735,7 +1735,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.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='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'/>
@@ -1749,7 +1749,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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'>
<function-decl name='__asan_backtrace_pcinfo' mangled-name='__asan_backtrace_pcinfo' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_pcinfo'>
<parameter type-id='type-id-23' name='state' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='166' column='1'/>
<parameter type-id='type-id-24' name='pc' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' line='166' column='1'/>
@@ -1783,7 +1783,7 @@
</function-decl>
<pointer-type-def type-id='type-id-25' 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'>
+ <abi-instr 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'>
<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-28'>
<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'/>
@@ -1824,7 +1824,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.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'>
<typedef-decl name='off_t' type-id='type-id-43' filepath='/usr/include/sys/types.h' line='87' column='1' id='type-id-44'/>
<typedef-decl name='__off_t' type-id='type-id-45' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-43'/>
<class-decl name='backtrace_view' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='169' column='1' id='type-id-46'>
@@ -1875,7 +1875,7 @@
</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'>
+ <abi-instr 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-25' name='descriptor' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1'/>
<parameter type-id='type-id-26' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1'/>
@@ -1902,7 +1902,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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-25' name='threaded' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' line='46' column='1'/>
@@ -1911,7 +1911,7 @@
<return type-id='type-id-23'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.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'>
<array-type-def dimensions='1' type-id='type-id-48' size-in-bits='8448' id='type-id-49'>
<subrange length='33' type-id='type-id-50' id='type-id-51'/>
</array-type-def>
@@ -2387,9 +2387,9 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.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'>
<qualified-type-def type-id='type-id-91' const='yes' id='type-id-92'/>
<pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-94'/>
<qualified-type-def type-id='type-id-94' const='yes' id='type-id-95'/>
@@ -2737,7 +2737,7 @@
<qualified-type-def type-id='type-id-159' volatile='yes' id='type-id-160'/>
<type-decl name='long long unsigned int' size-in-bits='64' id='type-id-161'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.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'>
<array-type-def dimensions='1' type-id='type-id-162' size-in-bits='768' id='type-id-163'>
<subrange length='6' type-id='type-id-50' id='type-id-164'/>
</array-type-def>
@@ -2926,9 +2926,9 @@
<reference-type-def kind='lvalue' type-id='type-id-196' size-in-bits='64' id='type-id-193'/>
<qualified-type-def type-id='type-id-189' const='yes' id='type-id-196'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.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/sanitizer_common/sanitizer_coverage.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.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'>
<pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-198'/>
<qualified-type-def type-id='type-id-198' const='yes' id='type-id-199'/>
<pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-201'/>
@@ -3024,9 +3024,9 @@
<type-decl name='unsigned int' size-in-bits='32' id='type-id-211'/>
<pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-219'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.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/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'>
+ <abi-instr 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-25'/>
@@ -3075,7 +3075,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.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'>
<qualified-type-def type-id='type-id-220' const='yes' id='type-id-221'/>
<qualified-type-def type-id='type-id-222' id='type-id-223'/>
<pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-220'/>
@@ -3287,7 +3287,7 @@
</enum-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.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'>
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='2048' id='type-id-246'>
<subrange length='256' type-id='type-id-50' id='type-id-194'/>
</array-type-def>
@@ -3637,7 +3637,7 @@
</namespace-decl>
<qualified-type-def type-id='type-id-287' volatile='yes' id='type-id-295'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.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'>
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='448' id='type-id-296'>
<subrange length='56' type-id='type-id-50' id='type-id-297'/>
</array-type-def>
@@ -3722,12 +3722,12 @@
<class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-312'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.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'>
<var-decl name='struct_statfs64_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer18struct_statfs64_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' line='63' column='1'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_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'>
<var-decl name='struct_utsname_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer17struct_utsname_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='120' column='1'/>
<var-decl name='struct_stat_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer14struct_stat_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='121' column='1'/>
@@ -4267,7 +4267,7 @@
<var-decl name='sigset_t_sz' type-id='type-id-211' mangled-name='_ZN11__sanitizer11sigset_t_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='138' column='1'/>
</namespace-decl>
</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'>
+ <abi-instr 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'>
<function-decl name='UnmapOrDie' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-1'/>
@@ -4280,7 +4280,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.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'>
<typedef-decl name='__uid_t' type-id='type-id-211' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-313'/>
<typedef-decl name='pthread_t' type-id='type-id-33' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-314'/>
<typedef-decl name='__useconds_t' type-id='type-id-211' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-315'/>
@@ -4334,7 +4334,7 @@
<typedef-decl name='rlim_t' type-id='type-id-321' filepath='/usr/include/bits/resource.h' line='127' column='1' id='type-id-320'/>
<typedef-decl name='__rlim_t' type-id='type-id-33' filepath='/usr/include/bits/types.h' line='146' column='1' id='type-id-321'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.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'>
<qualified-type-def type-id='type-id-168' const='yes' id='type-id-322'/>
<pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
<namespace-decl name='__sanitizer'>
@@ -4349,7 +4349,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.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'>
<array-type-def dimensions='1' type-id='type-id-33' size-in-bits='64' id='type-id-325'>
<subrange length='1' type-id='type-id-50' id='type-id-326'/>
</array-type-def>
@@ -4493,11 +4493,11 @@
<return type-id='type-id-112'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.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/sanitizer_common/sanitizer_stacktrace_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.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/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.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'>
<typedef-decl name='pid_t' type-id='type-id-352' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-353'/>
<qualified-type-def type-id='type-id-354' const='yes' id='type-id-355'/>
<pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-357'/>
@@ -4672,7 +4672,7 @@
<pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-384'/>
<reference-type-def kind='lvalue' type-id='type-id-382' size-in-bits='64' id='type-id-385'/>
</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'>
+ <abi-instr 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'>
<qualified-type-def type-id='type-id-240' const='yes' id='type-id-387'/>
<qualified-type-def type-id='type-id-388' id='type-id-389'/>
<qualified-type-def type-id='type-id-237' const='yes' id='type-id-390'/>
@@ -4693,7 +4693,7 @@
<qualified-type-def type-id='type-id-239' const='yes' id='type-id-397'/>
<qualified-type-def type-id='type-id-243' const='yes' id='type-id-398'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.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'>
<qualified-type-def type-id='type-id-399' const='yes' id='type-id-400'/>
<pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-399'/>
<namespace-decl name='__sanitizer'>
@@ -4875,7 +4875,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.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'>
<typedef-decl name='demangle_callbackref' type-id='type-id-89' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-87'/>
<typedef-decl name='backtrace_error_callback' type-id='type-id-32' filepath='../../.././libsanitizer/../libbacktrace/backtrace.h' line='82' column='1' id='type-id-26'/>
<typedef-decl name='uintptr_t' type-id='type-id-33' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-24'/>
@@ -4909,9 +4909,9 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.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/sanitizer_common/sanitizer_symbolizer_posix_libcdep.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 address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.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'>
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='131072' id='type-id-415'>
<subrange length='16384' type-id='type-id-50' id='type-id-416'/>
</array-type-def>
@@ -5124,7 +5124,7 @@
<return type-id='type-id-112'/>
</function-type>
</abi-instr>
- <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 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'>
<qualified-type-def type-id='type-id-430' const='yes' id='type-id-431'/>
<qualified-type-def type-id='type-id-432' const='yes' id='type-id-433'/>
<qualified-type-def type-id='type-id-434' const='yes' id='type-id-435'/>
@@ -5261,7 +5261,7 @@
</enum-decl>
</namespace-decl>
</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'>
+ <abi-instr 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-25'/>
<type-decl name='long long unsigned int' size-in-bits='64' id='type-id-161'/>
<array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1048576' id='type-id-442'>
@@ -5403,7 +5403,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.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'>
<namespace-decl name='__sanitizer'>
<function-decl name='atomic_fetch_sub<__sanitizer::atomic_uint64_t>' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-466'/>
@@ -7046,7 +7046,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.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'>
<pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-576'/>
<pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-577'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-578'/>
@@ -7061,13 +7061,13 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.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'>
<qualified-type-def type-id='type-id-492' const='yes' id='type-id-579'/>
<qualified-type-def type-id='type-id-580' const='yes' id='type-id-581'/>
<pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-580'/>
<qualified-type-def type-id='type-id-471' const='yes' id='type-id-582'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.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'>
<array-type-def dimensions='1' type-id='type-id-227' size-in-bits='16384' id='type-id-228'>
<subrange length='128' type-id='type-id-50' id='type-id-155'/>
</array-type-def>
@@ -15713,7 +15713,7 @@
<pointer-type-def type-id='type-id-1443' size-in-bits='64' id='type-id-671'/>
<qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1442'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.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='unsigned short int' size-in-bits='16' id='type-id-279'/>
<typedef-decl name='uu16' type-id='type-id-1436' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='171' column='1' id='type-id-1444'/>
<typedef-decl name='uu32' type-id='type-id-284' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='172' column='1' id='type-id-1445'/>
@@ -15793,7 +15793,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.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'>
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='1024' id='type-id-1456'>
<subrange length='128' type-id='type-id-50' id='type-id-155'/>
</array-type-def>
@@ -16162,7 +16162,7 @@
<return type-id='type-id-4'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.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='__int128' size-in-bits='128' id='type-id-1473'/>
<array-type-def dimensions='1' type-id='type-id-128' size-in-bits='27136' id='type-id-133'>
<subrange length='53' type-id='type-id-50' id='type-id-136'/>
@@ -18812,7 +18812,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.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='jptr' type-id='type-id-33' filepath='../../.././libsanitizer/tsan/tsan_interface_java.h' line='33' column='1' id='type-id-1582'/>
<pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
<pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
@@ -18932,7 +18932,7 @@
<return type-id='type-id-25'/>
</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'>
+ <abi-instr 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'>
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-1589'>
<subrange length='64' type-id='type-id-50' id='type-id-122'/>
</array-type-def>
@@ -18973,7 +18973,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.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'>
<array-type-def dimensions='1' type-id='type-id-115' size-in-bits='16777216' id='type-id-111'>
<subrange length='262144' type-id='type-id-50' id='type-id-116'/>
</array-type-def>
@@ -19256,7 +19256,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.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'>
<pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-1640'/>
<pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
<qualified-type-def type-id='type-id-1642' const='yes' id='type-id-1643'/>
@@ -19346,11 +19346,11 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.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'>
<qualified-type-def type-id='type-id-495' const='yes' id='type-id-1650'/>
<qualified-type-def type-id='type-id-1545' const='yes' id='type-id-1651'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_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'>
<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-316'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='rlim_cur' type-id='type-id-320' visibility='default' filepath='/usr/include/bits/resource.h' line='138' column='1'/>
@@ -19568,7 +19568,7 @@
<return type-id='type-id-4'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_report.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='variadic parameter type' id='type-id-1666'/>
<pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
<pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1670'/>
@@ -20084,7 +20084,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.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'>
<array-type-def dimensions='1' type-id='type-id-5' size-in-bits='3448832' id='type-id-1754'>
<subrange length='431104' type-id='type-id-50' id='type-id-1755'/>
</array-type-def>
@@ -20551,7 +20551,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1794' size-in-bits='64' id='type-id-1793'/>
<qualified-type-def type-id='type-id-1790' const='yes' id='type-id-1794'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.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'>
<qualified-type-def type-id='type-id-1552' const='yes' id='type-id-1795'/>
<namespace-decl name='__tsan'>
<function-decl name='AcquireImpl' filepath='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20574,7 +20574,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.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'>
<qualified-type-def type-id='type-id-523' const='yes' id='type-id-1796'/>
<pointer-type-def type-id='type-id-1797' size-in-bits='64' id='type-id-1798'/>
<qualified-type-def type-id='type-id-1798' const='yes' id='type-id-1799'/>
@@ -20737,7 +20737,7 @@
<qualified-type-def type-id='type-id-1827' const='yes' id='type-id-1828'/>
<reference-type-def kind='lvalue' type-id='type-id-1828' size-in-bits='64' id='type-id-1829'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.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'>
<array-type-def dimensions='1' type-id='type-id-1788' size-in-bits='5062656' id='type-id-1786'>
<subrange length='256' type-id='type-id-50' id='type-id-194'/>
</array-type-def>
@@ -21046,9 +21046,9 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.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'>
<qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1854'/>
<qualified-type-def type-id='type-id-239' const='yes' id='type-id-397'/>
<reference-type-def kind='lvalue' type-id='type-id-397' size-in-bits='64' id='type-id-388'/>
@@ -21065,7 +21065,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.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'>
<reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-1859'/>
<pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-407'/>
<pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-408'/>
@@ -21295,7 +21295,7 @@
<var-decl name='col' type-id='type-id-25' 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'>
+ <abi-instr 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-25' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-352'/>
<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-1866'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -21390,7 +21390,7 @@
<return type-id='type-id-45'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.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'>
+ <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.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'>
<pointer-type-def type-id='type-id-1876' size-in-bits='64' id='type-id-1877'/>
<pointer-type-def type-id='type-id-1878' size-in-bits='64' id='type-id-1879'/>
<pointer-type-def type-id='type-id-1880' size-in-bits='64' id='type-id-1881'/>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 47b20541..f4e98b80 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test16-pr18904.so' soname='liboffloadmic_host.so.5'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test16-pr18904.so' soname='liboffloadmic_host.so.5'>
<elf-needed>
<dependency name='libdl.so.2'/>
<dependency name='libstdc++.so.6'/>
@@ -1615,9 +1615,9 @@
<elf-symbol name='__offload_myo_var_tables' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='__offload_myo_vtable_tables' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/cean_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/cean_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32768' id='type-id-3'>
<subrange length='1024' type-id='type-id-4' id='type-id-5'/>
@@ -2177,7 +2177,7 @@
<qualified-type-def type-id='type-id-156' const='yes' id='type-id-155'/>
<type-decl name='char' size-in-bits='8' id='type-id-156'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-157' size-in-bits='128' id='type-id-158'>
<subrange length='1' type-id='type-id-4' id='type-id-159'/>
</array-type-def>
@@ -12098,9 +12098,9 @@
</class-decl>
<pointer-type-def type-id='type-id-2091' size-in-bits='64' id='type-id-2092'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='type-id-156'/>
<type-decl name='long int' size-in-bits='64' id='type-id-191'/>
<type-decl name='long long int' size-in-bits='64' id='type-id-247'/>
@@ -12185,7 +12185,7 @@
<return type-id='type-id-150'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-33' size-in-bits='8192' id='type-id-2093'>
<subrange length='128' type-id='type-id-4' id='type-id-2094'/>
</array-type-def>
@@ -14260,7 +14260,7 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_env.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_env.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<class-decl name='MicEnvVar' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='47' column='1' id='type-id-2453'>
<member-type access='public'>
<class-decl name='VarValue' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_env.h' line='72' column='1' id='type-id-2454'>
@@ -15714,7 +15714,7 @@
<reference-type-def kind='lvalue' type-id='type-id-2507' size-in-bits='64' id='type-id-2505'/>
<pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-2787'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-156' size-in-bits='4096' id='type-id-2983'>
<subrange length='512' type-id='type-id-4' id='type-id-2984'/>
</array-type-def>
@@ -16935,7 +16935,7 @@
<return type-id='type-id-154'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<class-decl name='MyoTable' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='474' column='1' id='type-id-3182'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='var_tab' type-id='type-id-3183' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='479' column='1'/>
@@ -18235,7 +18235,7 @@
<qualified-type-def type-id='type-id-3442' const='yes' id='type-id-3447'/>
<qualified-type-def type-id='type-id-3444' const='yes' id='type-id-3448'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32' id='type-id-3449'>
<subrange length='4' type-id='type-id-4' id='type-id-3450'/>
</array-type-def>
@@ -18397,9 +18397,9 @@
<return type-id='type-id-154'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-149'/>
<array-type-def dimensions='1' type-id='type-id-156' size-in-bits='320' id='type-id-2079'>
<subrange length='40' type-id='type-id-4' id='type-id-182'/>
@@ -19059,7 +19059,7 @@
<return type-id='type-id-154'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_timer_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_timer_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<typedef-decl name='clock_t' type-id='type-id-3498' filepath='/usr/include/time.h' line='59' column='1' id='type-id-3499'/>
<typedef-decl name='__clock_t' type-id='type-id-191' filepath='/usr/include/bits/types.h' line='135' column='1' id='type-id-3498'/>
<typedef-decl name='time_t' type-id='type-id-3500' filepath='/usr/include/time.h' line='75' column='1' id='type-id-3501'/>
@@ -19370,7 +19370,7 @@
<qualified-type-def type-id='type-id-3530' const='yes' id='type-id-3529'/>
<pointer-type-def type-id='type-id-3515' size-in-bits='64' id='type-id-3530'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-156' size-in-bits='128' id='type-id-3531'>
<subrange length='16' type-id='type-id-4' id='type-id-178'/>
</array-type-def>
@@ -20970,7 +20970,7 @@
<return type-id='type-id-154'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C99'>
+ <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C99'>
<array-type-def dimensions='1' type-id='type-id-3707' size-in-bits='1024' id='type-id-3708'>
<subrange length='16' type-id='type-id-4' id='type-id-178'/>
</array-type-def>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index f98624d8..4f5bddd1 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test17-pr19027.so' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test17-pr19027.so' soname='libharfbuzz.so.0'>
<elf-needed>
<dependency name='libglib-2.0.so.0'/>
<dependency name='libfreetype.so.6'/>
@@ -265,7 +265,7 @@
<elf-symbol name='hb_version_atleast' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-3'>
@@ -565,7 +565,7 @@
<return type-id='type-id-13'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-31' size-in-bits='512' id='type-id-70'>
<subrange length='8' type-id='type-id-4' id='type-id-71'/>
</array-type-def>
@@ -1544,7 +1544,7 @@
</class-decl>
<typedef-decl name='hb_tag_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-223'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<class-decl name='hb_utf_t<unsigned int, true>' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-224'/>
<class-decl name='hb_utf_t<short unsigned int, true>' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-225'/>
<class-decl name='hb_utf_t<unsigned char, true>' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-226'/>
@@ -1760,7 +1760,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-239'>
<subrange length='1' type-id='type-id-4' id='type-id-171'/>
</array-type-def>
@@ -1848,7 +1848,7 @@
<return type-id='type-id-131'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-249' size-in-bits='32' id='type-id-250'>
<subrange length='1' type-id='type-id-4' id='type-id-171'/>
</array-type-def>
@@ -9110,7 +9110,7 @@
<subrange length='1' type-id='type-id-4' id='type-id-171'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-143' const='yes' id='type-id-1120'/>
<pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-1121'/>
<function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
@@ -9453,7 +9453,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-1122'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='num_faces' type-id='type-id-1123' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
@@ -10013,7 +10013,7 @@
<class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'/>
<class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-1215'>
<underlying-type type-id='type-id-11'/>
<enumerator name='G_UNICODE_SCRIPT_INVALID_CODE' value='-1'/>
@@ -10156,7 +10156,7 @@
<return type-id='type-id-116'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
<subrange length='256' type-id='type-id-4' id='type-id-1001'/>
</array-type-def>
@@ -11011,7 +11011,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1372'/>
<qualified-type-def type-id='type-id-1275' const='yes' id='type-id-1373'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
<subrange length='1' type-id='type-id-4' id='type-id-171'/>
</array-type-def>
@@ -17071,7 +17071,7 @@
<pointer-type-def type-id='type-id-2357' size-in-bits='64' id='type-id-2347'/>
<pointer-type-def type-id='type-id-2358' size-in-bits='64' id='type-id-2348'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2359' size-in-bits='7168' id='type-id-2360'>
<subrange length='32' type-id='type-id-4' id='type-id-1379'/>
</array-type-def>
@@ -17211,7 +17211,7 @@
<qualified-type-def type-id='type-id-2289' const='yes' id='type-id-2391'/>
<qualified-type-def type-id='type-id-2290' const='yes' id='type-id-2392'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-423'/>
<reference-type-def kind='lvalue' type-id='type-id-620' size-in-bits='64' id='type-id-444'/>
<reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-442'/>
@@ -17245,15 +17245,15 @@
<qualified-type-def type-id='type-id-2401' const='yes' id='type-id-2402'/>
<pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-2311'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-133' size-in-bits='672' id='type-id-2403'>
<subrange length='21' type-id='type-id-4' id='type-id-2404'/>
</array-type-def>
@@ -17364,19 +17364,19 @@
<pointer-type-def type-id='type-id-2407' size-in-bits='64' id='type-id-2421'/>
<qualified-type-def type-id='type-id-2421' const='yes' id='type-id-2422'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-2346'>
<subrange length='8' type-id='type-id-4' id='type-id-71'/>
</array-type-def>
@@ -17551,7 +17551,7 @@
<return type-id='type-id-33'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-1399'/>
<function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
<parameter type-id='type-id-223' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
@@ -17572,7 +17572,7 @@
<return type-id='type-id-13'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
<subrange length='2048' type-id='type-id-4' id='type-id-1099'/>
</array-type-def>
@@ -17739,7 +17739,7 @@
<return type-id='type-id-28'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
<return type-id='type-id-177'/>
</function-decl>
@@ -17795,7 +17795,7 @@
<pointer-type-def type-id='type-id-2443' size-in-bits='64' id='type-id-2442'/>
<qualified-type-def type-id='type-id-31' const='yes' id='type-id-2443'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-31' const='yes' id='type-id-2443'/>
<pointer-type-def type-id='type-id-2443' size-in-bits='64' id='type-id-2442'/>
<function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
@@ -17829,7 +17829,7 @@
<return type-id='type-id-28'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
<function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
<return type-id='type-id-99'/>
</function-decl>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 926490b3..f7a467a9 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so' soname='libvtkRenderingLIC-6.1.so.1'>
<elf-needed>
<dependency name='libvtkIOLegacy-6.1.so.1'/>
<dependency name='libvtkIOXML-6.1.so.1'/>
@@ -450,7 +450,7 @@
<elf-symbol name='vtkSurfaceLICPainter_GeomVs' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
@@ -3381,7 +3381,7 @@
<typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-319'/>
<pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
<subrange length='6' type-id='type-id-4' id='type-id-322'/>
</array-type-def>
@@ -3456,7 +3456,7 @@
<return type-id='type-id-226'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-338'>
<subrange length='2' type-id='type-id-4' id='type-id-339'/>
</array-type-def>
@@ -5113,10 +5113,10 @@
<reference-type-def kind='lvalue' type-id='type-id-497' size-in-bits='64' id='type-id-491'/>
<qualified-type-def type-id='type-id-56' const='yes' id='type-id-497'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<class-decl name='vtkStructuredGridLIC2D' size-in-bits='1472' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.h' line='51' column='1' id='type-id-498'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-499'/>
<data-member access='protected' layout-offset-in-bits='1024'>
@@ -5376,7 +5376,7 @@
<class-decl name='vtkStructuredGrid' visibility='default' is-declaration-only='yes' id='type-id-524'/>
<class-decl name='vtkStructuredGridAlgorithm' visibility='default' is-declaration-only='yes' id='type-id-499'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<class-decl name='vtkSurfaceLICComposite' size-in-bits='3584' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.h' line='38' column='1' id='type-id-525'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-348'/>
<data-member access='protected' layout-offset-in-bits='384'>
@@ -6111,7 +6111,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<class-decl name='vtkSurfaceLICDefaultPainter' size-in-bits='1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.h' line='37' column='1' id='type-id-562'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-563'/>
<data-member access='protected' layout-offset-in-bits='1664'>
@@ -7743,7 +7743,7 @@
<class-decl name='vtkOpenGLLightMonitor' visibility='default' is-declaration-only='yes' id='type-id-658'/>
<qualified-type-def type-id='type-id-624' const='yes' id='type-id-657'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-590'>
<subrange length='3' type-id='type-id-4' id='type-id-642'/>
</array-type-def>
@@ -8555,7 +8555,7 @@
<class-decl name='vtkScalarsToColors' visibility='default' is-declaration-only='yes' id='type-id-760'/>
<class-decl name='vtkUniformVariables' visibility='default' is-declaration-only='yes' id='type-id-798'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
<class-decl name='vtkTextureIO' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.h' line='33' column='1' id='type-id-808'>
<member-function access='private' static='yes'>
<function-decl name='Write' mangled-name='_ZN12vtkTextureIO5WriteEPKcP16vtkTextureObjectRKSt5dequeI14vtkPixelExtentSaIS5_EEPKd' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN12vtkTextureIO5WriteEPKcP16vtkTextureObjectRKSt5dequeI14vtkPixelExtentSaIS5_EEPKd'>
@@ -8577,46 +8577,46 @@
</member-function>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAH' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAH' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAH'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_AAV' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_AAV' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAV.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_AAV'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_CE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_CE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_CE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_EE' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_EE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_EE.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_EE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_LIC0' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LIC0' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LIC0.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LIC0'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_LICI' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LICI' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICI.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LICI'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_LICN' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_LICN' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_LICN.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_LICN'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkLineIntegralConvolution2D_VT' type-id='type-id-68' mangled-name='vtkLineIntegralConvolution2D_VT' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_VT.cxx' line='9' column='1' elf-symbol-id='vtkLineIntegralConvolution2D_VT'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkStructuredGridLIC2D_fs' type-id='type-id-68' mangled-name='vtkStructuredGridLIC2D_fs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkStructuredGridLIC2D_fs.cxx' line='9' column='1' elf-symbol-id='vtkStructuredGridLIC2D_fs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_CE' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_CE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_CE.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_CE'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_DCpy' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_DCpy' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_DCpy.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_DCpy'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_GeomFs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomFs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomFs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomFs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_GeomVs' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_GeomVs' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_GeomVs.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_GeomVs'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' language='LANG_C_plus_plus'>
<var-decl name='vtkSurfaceLICPainter_SC' type-id='type-id-68' mangled-name='vtkSurfaceLICPainter_SC' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkSurfaceLICPainter_SC.cxx' line='9' column='1' elf-symbol-id='vtkSurfaceLICPainter_SC'/>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 71f8a129..6a31ea43 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so' soname='libtcmalloc_and_profiler.so.4'>
<elf-needed>
<dependency name='libunwind.so.8'/>
<dependency name='libpthread.so.0'/>
@@ -794,9 +794,9 @@
<elf-symbol name='heap_leak_checker_bcad_variable' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
+ <abi-instr address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
<function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='src/base/dynamic_annotations.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
<return type-id='type-id-1'/>
</function-decl>
@@ -806,7 +806,7 @@
<type-decl name='double' size-in-bits='64' id='type-id-2'/>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-4'>
<subrange length='16' type-id='type-id-5' id='type-id-6'/>
</array-type-def>
@@ -1201,7 +1201,7 @@
<type-decl name='unsigned int' size-in-bits='32' id='type-id-64'/>
<type-decl name='char' size-in-bits='8' id='type-id-65'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-66' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-67'/>
<typedef-decl name='pid_t' type-id='type-id-68' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-69'/>
<typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-68'/>
@@ -1241,7 +1241,7 @@
</data-member>
</class-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
<var-decl name='FLAGS_verbose' type-id='type-id-74' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead13FLAGS_verboseE' visibility='default' filepath='./src/base/logging.h' line='76' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead13FLAGS_verboseE'/>
<var-decl name='FLAGS_noverbose' type-id='type-id-65' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE' visibility='default' filepath='src/base/logging.cc' line='40' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE'/>
@@ -1264,7 +1264,7 @@
<typedef-decl name='int32' type-id='type-id-76' filepath='src/base/basictypes.h' line='60' column='1' id='type-id-74'/>
<typedef-decl name='int32_t' type-id='type-id-1' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-76'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-77' size-in-bits='1920' id='type-id-78'>
<subrange length='30' type-id='type-id-5' id='type-id-79'/>
</array-type-def>
@@ -1426,7 +1426,7 @@
<qualified-type-def type-id='type-id-87' const='yes' id='type-id-102'/>
<typedef-decl name='int64_t' type-id='type-id-85' filepath='/usr/include/stdint.h' line='41' column='1' id='type-id-103'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<class-decl name='CycleClock' size-in-bits='8' is-struct='yes' visibility='default' filepath='./src/base/cycleclock.h' line='79' column='1' id='type-id-104'/>
<namespace-decl name='base'>
<function-decl name='SubmitSpinLockProfileData' mangled-name='_ZN4base25SubmitSpinLockProfileDataEPKvl' filepath='./src/base/synchronization_profiling.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base25SubmitSpinLockProfileDataEPKvl'>
@@ -1436,7 +1436,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-105' const='yes' id='type-id-106'/>
<pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
<namespace-decl name='base'>
@@ -1481,7 +1481,7 @@
<pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-108'/>
<qualified-type-def type-id='type-id-93' const='yes' id='type-id-110'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='80' id='type-id-111'>
<subrange length='10' type-id='type-id-5' id='type-id-112'/>
</array-type-def>
@@ -1673,7 +1673,7 @@
<pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-125'/>
<qualified-type-def type-id='type-id-62' const='yes' id='type-id-117'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
<pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
<qualified-type-def type-id='type-id-135' const='yes' id='type-id-136'/>
@@ -1750,7 +1750,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-144' size-in-bits='64' id='type-id-145'/>
<qualified-type-def type-id='type-id-76' const='yes' id='type-id-146'/>
<reference-type-def kind='lvalue' type-id='type-id-146' size-in-bits='64' id='type-id-147'/>
@@ -1826,7 +1826,7 @@
<typedef-decl name='PageID' type-id='type-id-156' filepath='src/common.h' line='56' column='1' id='type-id-153'/>
<typedef-decl name='uintptr_t' type-id='type-id-5' filepath='/usr/include/stdint.h' line='123' column='1' id='type-id-156'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<namespace-decl name='tcmalloc'>
<function-decl name='metadata_system_bytes' mangled-name='_ZN8tcmalloc21metadata_system_bytesEv' filepath='src/common.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc21metadata_system_bytesEv'>
<return type-id='type-id-15'/>
@@ -1841,7 +1841,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<class-decl name='HeapLeakCheckerGlobalPrePost' size-in-bits='8' visibility='default' filepath='src/heap-checker-bcad.cc' line='60' column='1' id='type-id-157'>
<data-member access='private' static='yes'>
<var-decl name='count_' type-id='type-id-1' mangled-name='_ZN28HeapLeakCheckerGlobalPrePost6count_E' visibility='default' filepath='src/heap-checker-bcad.cc' line='87' column='1' elf-symbol-id='_ZN28HeapLeakCheckerGlobalPrePost6count_E'/>
@@ -1863,7 +1863,7 @@
<pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-158'/>
<var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-61' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='infinite' id='type-id-159'>
<subrange length='infinite' id='type-id-160'/>
</array-type-def>
@@ -7343,7 +7343,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1057'/>
<qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1059'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-265' const='yes' id='type-id-275'/>
<qualified-type-def type-id='type-id-245' const='yes' id='type-id-248'/>
<qualified-type-def type-id='type-id-228' const='yes' id='type-id-1060'/>
@@ -8243,7 +8243,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1138' size-in-bits='64' id='type-id-1137'/>
<qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1138'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<class-decl name='HeapProfileEndWriter' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/heap-profiler.cc' line='593' column='1' id='type-id-1139'>
<member-function access='public' destructor='yes'>
<function-decl name='~HeapProfileEndWriter' mangled-name='_ZN20HeapProfileEndWriterD1Ev' filepath='src/heap-profiler.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN20HeapProfileEndWriterD1Ev'>
@@ -8299,7 +8299,7 @@
<return type-id='type-id-60'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-65' size-in-bits='1600' id='type-id-1141'>
<subrange length='200' type-id='type-id-5' id='type-id-1142'/>
</array-type-def>
@@ -8500,7 +8500,7 @@
<type-decl name='long long unsigned int' size-in-bits='64' id='type-id-1160'/>
<pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-1158'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<enum-decl name='MallocExtension_Ownership' filepath='src/gperftools/malloc_extension_c.h' line='87' column='1' id='type-id-1161'>
<underlying-type type-id='type-id-89'/>
<enumerator name='MallocExtension_kUnknownOwnership' value='0'/>
@@ -8572,7 +8572,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1163' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1164'/>
<typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-1165' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-1166'/>
<typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-1167' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-1168'/>
@@ -8982,7 +8982,7 @@
<pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1230'/>
<qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1231'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
<pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1235'/>
<function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
@@ -9011,7 +9011,7 @@
<typedef-decl name='pthread_key_t' type-id='type-id-64' filepath='/usr/include/bits/pthreadtypes.h' line='140' column='1' id='type-id-1232'/>
<typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1234'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<class-decl name='HugetlbSysAllocator' size-in-bits='384' visibility='default' filepath='src/memfs_malloc.cc' line='90' column='1' id='type-id-1236'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-997'/>
<data-member access='private' layout-offset-in-bits='64'>
@@ -9089,7 +9089,7 @@
<var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-65' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-212' size-in-bits='8960' id='type-id-197'>
<subrange length='20' type-id='type-id-5' id='type-id-926'/>
</array-type-def>
@@ -9405,7 +9405,7 @@
<return type-id='type-id-60'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1280' const='yes' id='type-id-1281'/>
<namespace-decl name='tcmalloc'>
<namespace-decl name='commandlineflags'>
@@ -9460,7 +9460,7 @@
</class-decl>
<pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-1285'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<typedef-decl name='ProfileHandlerCallback' type-id='type-id-1286' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1287'/>
<class-decl name='timer_id_holder' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/profile-handler.cc' line='266' column='1' id='type-id-1288'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -10101,7 +10101,7 @@
</data-member>
</union-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1386' const='yes' id='type-id-1387'/>
<qualified-type-def type-id='type-id-1388' id='type-id-1389'/>
<qualified-type-def type-id='type-id-1390' id='type-id-1391'/>
@@ -10299,7 +10299,7 @@
<pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-1415'/>
<typedef-decl name='__time_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-1416'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1405' size-in-bits='4096' id='type-id-1406'>
<subrange length='64' type-id='type-id-5' id='type-id-1412'/>
</array-type-def>
@@ -10802,7 +10802,7 @@
<return type-id='type-id-1'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1429'/>
<qualified-type-def type-id='type-id-1429' const='yes' id='type-id-1430'/>
<qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1431'/>
@@ -10845,7 +10845,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1434' id='type-id-1435'/>
<namespace-decl name='std'>
<function-decl name='min<double>' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10861,7 +10861,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1436' size-in-bits='64' id='type-id-1434'/>
<qualified-type-def type-id='type-id-2' const='yes' id='type-id-1436'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1437' const='yes' id='type-id-1438'/>
<namespace-decl name='tcmalloc'>
<function-decl name='DeleteSpan' mangled-name='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE' filepath='src/span.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE'>
@@ -10912,7 +10912,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1440' const='yes' id='type-id-1441'/>
<pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-1442'/>
<qualified-type-def type-id='type-id-1443' const='yes' id='type-id-1444'/>
@@ -11034,7 +11034,7 @@
<subrange length='31' type-id='type-id-5' id='type-id-1461'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<namespace-decl name='tcmalloc'>
<namespace-decl name='commandlineflags'>
<function-decl name='StringToBool' filepath='src/base/commandlineflags.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11073,7 +11073,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<namespace-decl name='tcmalloc'>
<namespace-decl name='commandlineflags'>
<function-decl name='StringToBool' filepath='./src/base/commandlineflags.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11084,7 +11084,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1462'>
<member-type access='private'>
<typedef-decl name='SymbolMap' type-id='type-id-1464' filepath='src/symbolize.h' line='72' column='1' id='type-id-1463'/>
@@ -11530,7 +11530,7 @@
<var-decl name='FLAGS_nosymbolize_pprof' type-id='type-id-65' mangled-name='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_nosymbolize_pprofE' visibility='default' filepath='src/symbolize.cc' line='70' column='1' elf-symbol-id='_ZN62FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead23FLAGS_nosymbolize_pprofE'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-966' size-in-bits='128' id='type-id-1541'>
<subrange length='2' type-id='type-id-5' id='type-id-1542'/>
</array-type-def>
@@ -11678,7 +11678,7 @@
<var-decl name='sys_alloc' type-id='type-id-966' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
<var-decl name='TCMalloc_SystemTaken' type-id='type-id-62' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-922' size-in-bits='512' id='type-id-923'>
<subrange length='8' type-id='type-id-5' id='type-id-925'/>
</array-type-def>
@@ -15385,7 +15385,7 @@
<return type-id='type-id-58'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1766'/>
<qualified-type-def type-id='type-id-1720' const='yes' id='type-id-1767'/>
<namespace-decl name='std'>
diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi
index 98dd9a60..3c18f234 100644
--- a/tests/data/test-read-dwarf/test2.so.abi
+++ b/tests/data/test-read-dwarf/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test2.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test2.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -15,7 +15,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<typedef-decl name='character' type-id='type-id-2' id='type-id-3'/>
<typedef-decl name='integer' type-id='type-id-1' id='type-id-4'/>
@@ -48,7 +48,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<class-decl name='second_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='12' column='1' id='type-id-8'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='member0' type-id='type-id-4' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='14' column='1'/>
diff --git a/tests/data/test-read-dwarf/test2.so.hash.abi b/tests/data/test-read-dwarf/test2.so.hash.abi
index bb814f73..c49e9a82 100644
--- a/tests/data/test-read-dwarf/test2.so.hash.abi
+++ b/tests/data/test-read-dwarf/test2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test2.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test2.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -15,7 +15,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='95e97e5e'/>
<typedef-decl name='character' type-id='002ac4a6' id='8ec86933'/>
<typedef-decl name='integer' type-id='95e97e5e' id='c2cab9c6'/>
@@ -48,7 +48,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<class-decl name='second_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='12' column='1' id='cf111fae'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='member0' type-id='c2cab9c6' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='14' column='1'/>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index f769ac40..9a00f6fe 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so' soname='libvtkParallelCore-6.1.so.1'>
<elf-needed>
<dependency name='libvtkIOLegacy-6.1.so.1'/>
<dependency name='libvtkIOCore-6.1.so.1'/>
@@ -386,7 +386,7 @@
<elf-symbol name='_ZTV25vtkMultiProcessController' size='344' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
@@ -4771,7 +4771,7 @@
<typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-535'/>
<pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-544'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkDummyCommunicator' size-in-bits='576' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.h' line='32' column='1' id='type-id-546'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-118'/>
<member-function access='protected' constructor='yes'>
@@ -4854,7 +4854,7 @@
<pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-549'/>
<pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
<member-type access='public'>
@@ -6984,7 +6984,7 @@
<qualified-type-def type-id='type-id-718' const='yes' id='type-id-738'/>
<qualified-type-def type-id='type-id-720' const='yes' id='type-id-739'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkFieldDataSerializer' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.h' line='41' column='1' id='type-id-740'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
<member-function access='protected' constructor='yes'>
@@ -7153,7 +7153,7 @@
<class-decl name='vtkIntArray' visibility='default' is-declaration-only='yes' id='type-id-755'/>
<class-decl name='vtkStringArray' visibility='default' is-declaration-only='yes' id='type-id-756'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkProcess' size-in-bits='512' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.h' line='44' column='1' id='type-id-591'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
<data-member access='protected' layout-offset-in-bits='384'>
@@ -10900,7 +10900,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-1226'/>
<qualified-type-def type-id='type-id-90' const='yes' id='type-id-1231'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-40' size-in-bits='256' id='type-id-451'>
<subrange length='4' type-id='type-id-4' id='type-id-11'/>
</array-type-def>
@@ -11700,13 +11700,13 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
<reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-594'/>
<pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-596'/>
<qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
<reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-597'/>
<pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-599'/>
@@ -11733,7 +11733,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkSocketCommunicator' size-in-bits='1088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='55' column='1' id='type-id-1286'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-118'/>
<member-type access='private'>
@@ -13543,7 +13543,7 @@
<class-decl name='vtkServerSocket' visibility='default' is-declaration-only='yes' id='type-id-1520'/>
<class-decl name='vtkSocket' visibility='default' is-declaration-only='yes' id='type-id-1521'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkSocketController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.h' line='47' column='1' id='type-id-1549'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
<data-member access='protected' static='yes'>
@@ -13702,7 +13702,7 @@
<pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
<qualified-type-def type-id='type-id-1550' const='yes' id='type-id-1552'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<class-decl name='vtkSubCommunicator' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.h' line='52' column='1' id='type-id-1555'>
<base-class access='public' layout-offset-in-bits='0' type-id='type-id-118'/>
<data-member access='protected' layout-offset-in-bits='576'>
@@ -13801,7 +13801,7 @@
<pointer-type-def type-id='type-id-1559' size-in-bits='64' id='type-id-1558'/>
<pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1560'>
<subrange length='20' type-id='type-id-4' id='type-id-7'/>
</array-type-def>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index cf635351..988e4cf8 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test21-pr19092.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test21-pr19092.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -449,9 +449,9 @@
<elf-symbol name='version_string' size='6' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.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'>
+ <abi-instr address-size='64' path='../.././gcc/collect2-aix.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.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'>
+ <abi-instr address-size='64' path='../.././gcc/collect2.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='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='1024' id='type-id-3'>
@@ -1861,7 +1861,7 @@
</data-member>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<enum-decl name='__anonymous_enum__' is-anonymous='yes' linkage-name='12diagnostic_t' filepath='../.././gcc/diagnostic-core.h' line='32' column='1' id='type-id-185'>
<underlying-type type-id='type-id-26'/>
<enumerator name='DK_UNSPECIFIED' value='0'/>
@@ -2158,7 +2158,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-200'>
<underlying-type type-id='type-id-26'/>
<enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
@@ -2872,7 +2872,7 @@
<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'>
+ <abi-instr address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-202'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
@@ -2919,7 +2919,7 @@
<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-75' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<type-decl name='wchar_t' size-in-bits='32' id='type-id-204'/>
<typedef-decl name='nl_item' type-id='type-id-18' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-205'/>
<qualified-type-def type-id='type-id-204' const='yes' id='type-id-206'/>
@@ -2981,7 +2981,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<typedef-decl name='iconv_t' type-id='type-id-14' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-209'/>
<qualified-type-def type-id='type-id-96' const='yes' id='type-id-210'/>
<pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
@@ -3133,7 +3133,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-215'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='value' type-id='type-id-216' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
@@ -3342,7 +3342,7 @@
<return type-id='type-id-14'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.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'>
+ <abi-instr address-size='64' path='../.././gcc/vec.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'>
<function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
<parameter type-id='type-id-14'/>
<parameter type-id='type-id-18'/>
@@ -3433,7 +3433,7 @@
<return type-id='type-id-14'/>
</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'>
+ <abi-instr address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='248' id='type-id-248'>
<subrange length='31' type-id='type-id-4' id='type-id-249'/>
</array-type-def>
@@ -3456,7 +3456,7 @@
<var-decl name='pkgversion_string' type-id='type-id-256' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
<var-decl name='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'>
+ <abi-instr address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
<function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
<parameter type-id='type-id-259'/>
@@ -4570,7 +4570,7 @@
</class-decl>
<typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-384'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<typedef-decl name='pragma_cb' type-id='type-id-330' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-388'/>
<typedef-decl name='cpp_options' type-id='type-id-301' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-389'/>
<typedef-decl name='cpp_callbacks' type-id='type-id-298' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-390'/>
@@ -4755,7 +4755,7 @@
<return type-id='type-id-18'/>
</function-type>
</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'>
+ <abi-instr 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_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
<parameter type-id='type-id-259'/>
<parameter type-id='type-id-18'/>
@@ -4832,7 +4832,7 @@
<return type-id='type-id-51'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<typedef-decl name='cpp_num' type-id='type-id-381' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-361'/>
<class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-381'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -4910,7 +4910,7 @@
<return type-id='type-id-361'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='2048' id='type-id-397'>
<subrange length='256' type-id='type-id-4' id='type-id-398'/>
</array-type-def>
@@ -5164,7 +5164,7 @@
</function-type>
<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'>
+ <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<typedef-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'>
@@ -5203,7 +5203,7 @@
<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-315' 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'>
+ <abi-instr address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<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-4' id='type-id-398'/>
</array-type-def>
@@ -5255,7 +5255,7 @@
</function-decl>
<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'>
+ <abi-instr address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-274'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='previous' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
@@ -5386,7 +5386,7 @@
<return type-id='type-id-15'/>
</function-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'>
+ <abi-instr 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-162' size-in-bits='192' id='type-id-159'>
<subrange length='1' type-id='type-id-4' id='type-id-7'/>
</array-type-def>
@@ -5785,7 +5785,7 @@
<return type-id='type-id-18'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-307'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='name' type-id='type-id-15' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -7148,7 +7148,7 @@
</function-type>
<class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-427'/>
</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'>
+ <abi-instr address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-313' const='yes' id='type-id-438'/>
<pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-439'/>
<function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/mkdeps.c' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
@@ -7202,7 +7202,7 @@
<return type-id='type-id-18'/>
</function-decl>
</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'>
+ <abi-instr 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_create' mangled-name='_Z9ht_createj' filepath='../.././libcpp/symtab.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_createj'>
<parameter type-id='type-id-13'/>
<return type-id='type-id-413'/>
@@ -7260,7 +7260,7 @@
<enumerator name='HT_ALLOC' value='1'/>
</enum-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'>
+ <abi-instr address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
<enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-440'>
<underlying-type type-id='type-id-26'/>
<enumerator name='HT_NO_INSERT' value='0'/>
@@ -7317,7 +7317,7 @@
<return type-id='type-id-1'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.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'>
+ <abi-instr address-size='64' path='../.././libiberty/argv.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='freeargv' mangled-name='freeargv' filepath='../.././libiberty/argv.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freeargv'>
<parameter type-id='type-id-123' name='vector' filepath='../.././libiberty/argv.c' line='108' column='1'/>
<return type-id='type-id-31'/>
@@ -7367,7 +7367,7 @@
<return type-id='type-id-31'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.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'>
+ <abi-instr address-size='64' path='../.././libiberty/concat.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='concat_copy' mangled-name='concat_copy' filepath='../.././libiberty/concat.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='concat_copy'>
<parameter type-id='type-id-51' name='dst' filepath='../.././libiberty/concat.c' line='117' column='1'/>
<parameter type-id='type-id-15' name='first' filepath='../.././libiberty/concat.c' line='117' column='1'/>
@@ -7382,7 +7382,7 @@
</function-decl>
<var-decl name='libiberty_concat_ptr' type-id='type-id-51' 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'>
+ <abi-instr address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-4' id='type-id-443'/>
</array-type-def>
@@ -7802,7 +7802,7 @@
<return type-id='type-id-31'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-4' id='type-id-483'/>
</array-type-def>
@@ -7882,9 +7882,9 @@
<return type-id='type-id-51'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.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'>
+ <abi-instr address-size='64' path='../.././libiberty/filename_cmp.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'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.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'>
+ <abi-instr address-size='64' path='../.././libiberty/fopen_unlocked.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='unlock_stream' mangled-name='unlock_stream' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_stream'>
<parameter type-id='type-id-89' name='fp' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1'/>
<return type-id='type-id-31'/>
@@ -7912,14 +7912,14 @@
<return type-id='type-id-89'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.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'>
+ <abi-instr address-size='64' path='../.././libiberty/getpwd.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='getcwd' filepath='/usr/include/unistd.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-51'/>
<parameter type-id='type-id-32'/>
<return type-id='type-id-51'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-228' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
@@ -8012,13 +8012,13 @@
<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'>
+ <abi-instr address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-31'/>
</function-decl>
<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'>
+ <abi-instr address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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'>
<parameter type-id='type-id-15' name='name' filepath='../.././libiberty/lbasename.c' line='49' column='1'/>
<return type-id='type-id-15'/>
@@ -8028,7 +8028,7 @@
<return type-id='type-id-15'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.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'>
+ <abi-instr address-size='64' path='../.././libiberty/make-temp-file.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='choose_tmpdir' mangled-name='choose_tmpdir' filepath='../.././libiberty/make-temp-file.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='choose_tmpdir'>
<return type-id='type-id-51'/>
</function-decl>
@@ -8038,7 +8038,7 @@
<return type-id='type-id-18'/>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-4' id='type-id-492'/>
</array-type-def>
@@ -8108,7 +8108,7 @@
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.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'>
+ <abi-instr address-size='64' path='../.././libiberty/pex-common.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'>
<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-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
@@ -8316,7 +8316,7 @@
<return type-id='type-id-31'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
+ <abi-instr address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<typedef-decl name='__WAIT_STATUS' type-id='type-id-498' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-499'/>
<union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-498'>
<data-member access='private'>
@@ -8479,7 +8479,7 @@
<return type-id='type-id-18'/>
</function-decl>
</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'>
+ <abi-instr address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<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-4' id='type-id-398'/>
</array-type-def>
@@ -8491,7 +8491,7 @@
<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'>
+ <abi-instr address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-18'/>
<parameter type-id='type-id-15'/>
@@ -8499,10 +8499,10 @@
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.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'>
+ <abi-instr address-size='64' path='../.././libiberty/xexit.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'>
<var-decl name='_xexit_cleanup' type-id='type-id-136' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
+ <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
<typedef-decl name='intptr_t' type-id='type-id-511' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-512'/>
<typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-511'/>
<function-decl name='xmalloc_failed' mangled-name='xmalloc_failed' filepath='../.././libiberty/xmalloc.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xmalloc_failed'>
@@ -8519,6 +8519,6 @@
<return type-id='type-id-14'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.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'>
+ <abi-instr address-size='64' path='../.././libiberty/xmemdup.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'>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 807cf30f..1ad996a5 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so' soname='libstdc++.so.6'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so' soname='libstdc++.so.6'>
<elf-needed>
<dependency name='libm.so.6'/>
<dependency name='libc.so.6'/>
@@ -3670,7 +3670,7 @@
<elf-symbol name='_ZTVSt9strstream' size='120' version='GLIBCXX_3.4' is-default-version='yes' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVSt9type_info' size='64' version='GLIBCXX_3.4' is-default-version='yes' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/array_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/array_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
<namespace-decl name='__cxxabiv1'>
<class-decl name='__array_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='219' column='1' id='type-id-1'>
@@ -3952,9 +3952,9 @@
<qualified-type-def type-id='type-id-22' const='yes' id='type-id-31'/>
<type-decl name='long int' size-in-bits='64' id='type-id-32'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/atexit_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/atexit_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-33' const='yes' id='type-id-34'/>
<pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-35'/>
<pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-36'/>
@@ -4037,7 +4037,7 @@
<pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-38'/>
<qualified-type-def type-id='type-id-37' const='yes' id='type-id-40'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_cast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_cast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-41' const='yes' id='type-id-42'/>
<pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-43'/>
<pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-44'/>
@@ -4080,7 +4080,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-45' const='yes' id='type-id-46'/>
<pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
<pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-48'/>
@@ -4123,7 +4123,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<typedef-decl name='ptrdiff_t' type-id='type-id-32' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/stddef.h' line='150' column='1' id='type-id-29'/>
<pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-27'/>
<reference-type-def kind='lvalue' type-id='type-id-22' size-in-bits='64' id='type-id-30'/>
@@ -4287,7 +4287,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator delete' mangled-name='_ZdlPv' filepath='../../.././libstdc++-v3/libsupc++/del_op.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPv@@GLIBCXX_3.4'>
<parameter type-id='type-id-18'/>
<return type-id='type-id-5'/>
@@ -4297,7 +4297,7 @@
<return type-id='type-id-5'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-49' const='yes' id='type-id-50'/>
<qualified-type-def type-id='type-id-51' id='type-id-52'/>
<reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-51'/>
@@ -4310,20 +4310,20 @@
<return type-id='type-id-5'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator delete []' mangled-name='_ZdaPv' filepath='../../.././libstdc++-v3/libsupc++/del_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPv@@GLIBCXX_3.4'>
<parameter type-id='type-id-18'/>
<return type-id='type-id-5'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator delete []' mangled-name='_ZdaPvRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4'>
<parameter type-id='type-id-18' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
<parameter type-id='type-id-52'/>
<return type-id='type-id-5'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__dynamic_cast' mangled-name='__dynamic_cast' filepath='../../.././libstdc++-v3/libsupc++/dyncast.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_cast@@CXXABI_1.3'>
<parameter type-id='type-id-18'/>
@@ -4334,7 +4334,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<typedef-decl name='_Unwind_Ptr' type-id='type-id-53' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='48' column='1' id='type-id-54'/>
<typedef-decl name='_Unwind_Exception_Class' type-id='type-id-53' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='56' column='1' id='type-id-55'/>
<typedef-decl name='_Unwind_Exception_Cleanup_Fn' type-id='type-id-56' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='82' column='1' id='type-id-57'/>
@@ -4676,9 +4676,9 @@
</class-decl>
<pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_bad_cast' mangled-name='__cxa_bad_cast' filepath='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_bad_cast@@CXXABI_1.3'>
<return type-id='type-id-5'/>
@@ -4688,7 +4688,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_begin_catch' mangled-name='__cxa_begin_catch' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_begin_catch@@CXXABI_1.3'>
<parameter type-id='type-id-18'/>
@@ -4696,7 +4696,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_catch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_catch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-111'/>
<namespace-decl name='__cxxabiv1'>
<class-decl name='__cxa_eh_globals' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/unwind-cxx.h' line='138' column='1' id='type-id-110'>
@@ -4731,7 +4731,7 @@
<return type-id='type-id-5'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
<pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
<qualified-type-def type-id='type-id-116' const='yes' id='type-id-117'/>
@@ -4838,9 +4838,9 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_globals.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_globals.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_personality.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_personality.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<typedef-decl name='_Unwind_Action' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='100' column='1' id='type-id-120'/>
<pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
<pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-123'/>
@@ -4899,7 +4899,7 @@
</function-decl>
<class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-121'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-124' visibility='default' id='type-id-125'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='__pfn' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/exception_ptr.h' line='105' column='1'/>
@@ -5063,12 +5063,12 @@
<return type-id='type-id-5'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<var-decl name='__terminate_handler' type-id='type-id-95' mangled-name='_ZN10__cxxabiv119__terminate_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' line='40' column='1'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<function-decl name='terminate' mangled-name='_ZSt9terminatev' filepath='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9terminatev@@GLIBCXX_3.4'>
<return type-id='type-id-5'/>
@@ -5086,7 +5086,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_throw' mangled-name='__cxa_throw' filepath='../../.././libstdc++-v3/libsupc++/eh_throw.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_throw@@CXXABI_1.3'>
<parameter type-id='type-id-18'/>
@@ -5103,7 +5103,7 @@
<return type-id='type-id-59'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_tm_cleanup' mangled-name='__cxa_tm_cleanup' filepath='../../.././libstdc++-v3/libsupc++/eh_tm.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_tm_cleanup@@CXXABI_TM_1'>
<parameter type-id='type-id-18'/>
@@ -5113,19 +5113,19 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_type.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_type.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_current_exception_type' mangled-name='__cxa_current_exception_type' filepath='../../.././libstdc++-v3/libsupc++/eh_type.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_current_exception_type@@CXXABI_1.3'>
<return type-id='type-id-7'/>
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='__cxxabiv1'>
<var-decl name='__unexpected_handler' type-id='type-id-94' mangled-name='_ZN10__cxxabiv120__unexpected_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' line='28' column='1'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
<namespace-decl name='__cxxabiv1'>
<class-decl name='__enum_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='246' column='1' id='type-id-138'>
@@ -5161,7 +5161,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/function_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/function_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
<qualified-type-def type-id='type-id-140' const='yes' id='type-id-142'/>
<pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-143'/>
@@ -5205,7 +5205,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/fundamental_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/fundamental_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-145'/>
<namespace-decl name='__cxxabiv1'>
<class-decl name='__fundamental_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='208' column='1' id='type-id-144'>
@@ -5241,7 +5241,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/guard.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-147'/>
<pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
<namespace-decl name='__cxxabiv1'>
@@ -5297,9 +5297,9 @@
<return type-id='type-id-32'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<function-decl name='_Hash_bytes' mangled-name='_ZSt11_Hash_bytesPKvmm' filepath='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11_Hash_bytesPKvmm@@CXXABI_1.3.5'>
<parameter type-id='type-id-18'/>
@@ -5315,7 +5315,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/nested_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/nested_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-150' const='yes' id='type-id-151'/>
<reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
<pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-153'/>
@@ -5363,7 +5363,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/new_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<typedef-decl name='new_handler' type-id='type-id-97' filepath='../../.././libstdc++-v3/libsupc++/new' line='75' column='1' id='type-id-156'/>
<function-decl name='set_new_handler' mangled-name='_ZSt15set_new_handlerPFvvE' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4'>
@@ -5373,13 +5373,13 @@
<var-decl name='nothrow' type-id='type-id-50' mangled-name='_ZSt7nothrow' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='30' column='1' elf-symbol-id='_ZSt7nothrow@@GLIBCXX_3.4'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libstdc++-v3/libsupc++/new_op.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm@@GLIBCXX_3.4'>
<parameter type-id='type-id-96'/>
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator new' mangled-name='_ZnwmRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmRKSt9nothrow_t@@GLIBCXX_3.4'>
<parameter type-id='type-id-96' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
<parameter type-id='type-id-52'/>
@@ -5390,20 +5390,20 @@
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator new []' mangled-name='_Znam' filepath='../../.././libstdc++-v3/libsupc++/new_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znam@@GLIBCXX_3.4'>
<parameter type-id='type-id-96'/>
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<function-decl name='operator new []' mangled-name='_ZnamRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnamRKSt9nothrow_t@@GLIBCXX_3.4'>
<parameter type-id='type-id-96' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
<parameter type-id='type-id-52'/>
<return type-id='type-id-18'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-157' size-in-bits='64' id='type-id-158'/>
<pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-159'/>
<qualified-type-def type-id='type-id-157' const='yes' id='type-id-160'/>
@@ -5486,7 +5486,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
<pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-166'/>
<qualified-type-def type-id='type-id-164' const='yes' id='type-id-167'/>
@@ -5548,7 +5548,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-171'/>
<qualified-type-def type-id='type-id-170' const='yes' id='type-id-172'/>
<pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
@@ -5603,7 +5603,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<typedef-decl name='ssize_t' type-id='type-id-174' filepath='/usr/include/unistd.h' line='221' column='1' id='type-id-175'/>
<typedef-decl name='__ssize_t' type-id='type-id-32' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-174'/>
<namespace-decl name='__cxxabiv1'>
@@ -5621,7 +5621,7 @@
<return type-id='type-id-175'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
<pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-178'/>
<qualified-type-def type-id='type-id-176' const='yes' id='type-id-179'/>
@@ -5704,12 +5704,12 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-3' size-in-bits='64' id='type-id-182'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vec.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/vec.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-184'/>
<pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-186'/>
<pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-188'/>
@@ -5813,7 +5813,7 @@
<return type-id='type-id-18'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-190' size-in-bits='128' id='type-id-191'>
<subrange length='1' type-id='type-id-106' id='type-id-192'/>
</array-type-def>
@@ -5924,7 +5924,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-202'/>
<namespace-decl name='__cxxabiv1'>
<function-decl name='__cxa_demangle' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6062,7 +6062,7 @@
</class-decl>
<typedef-decl name='_IO_lock_t' type-id='type-id-5' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-215'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C89'>
+ <abi-instr address-size='64' path='cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C89'>
<function-decl name='__cxa_demangle' mangled-name='__cxa_demangle' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_demangle@@CXXABI_1.3'>
<parameter type-id='type-id-4' name='mangled_name' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
<parameter type-id='type-id-98' name='output_buffer' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
@@ -6092,7 +6092,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='320' id='type-id-105'>
<subrange length='40' type-id='type-id-106' id='type-id-107'/>
</array-type-def>
@@ -6486,7 +6486,7 @@
</class-decl>
<qualified-type-def type-id='type-id-262' const='yes' id='type-id-283'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<typedef-decl name='lldiv_t' type-id='type-id-284' filepath='/usr/include/stdlib.h' line='122' column='1' id='type-id-285'/>
<class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-285' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1' id='type-id-284'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -11083,7 +11083,7 @@
</namespace-decl>
<pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-618'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-619' visibility='default' id='type-id-620'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='__pfn' type-id='type-id-621' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1435' column='1'/>
@@ -13020,9 +13020,9 @@
<qualified-type-def type-id='type-id-902' const='yes' id='type-id-932'/>
<pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-933'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-934' id='type-id-935'/>
<reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-934'/>
<pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
@@ -13107,9 +13107,9 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-940' id='type-id-941'/>
<reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-940'/>
<pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
@@ -13192,9 +13192,9 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-946' id='type-id-947'/>
<reference-type-def kind='lvalue' type-id='type-id-948' size-in-bits='64' id='type-id-946'/>
<pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
@@ -13279,7 +13279,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-10'/>
<type-decl name='char' size-in-bits='8' id='type-id-16'/>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='8' id='type-id-211'>
@@ -30396,7 +30396,7 @@
<qualified-type-def type-id='type-id-209' const='yes' id='type-id-1884'/>
<class-decl name='__locale_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1885'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/chrono.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/chrono.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-1886'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='tv_sec' type-id='type-id-220' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
@@ -30576,7 +30576,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/condition_variable.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/condition_variable.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='384' id='type-id-928'>
<subrange length='48' type-id='type-id-106' id='type-id-929'/>
</array-type-def>
@@ -30818,7 +30818,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/debug.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/debug.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1919' size-in-bits='4032' id='type-id-1920'>
<subrange length='9' type-id='type-id-106' id='type-id-1921'/>
</array-type-def>
@@ -31438,7 +31438,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/fstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/fstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1526' const='yes' id='type-id-1980'/>
<qualified-type-def type-id='type-id-1533' id='type-id-1981'/>
<qualified-type-def type-id='type-id-1529' id='type-id-1982'/>
@@ -32694,7 +32694,7 @@
<pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-2050'/>
<pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-2051'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/functexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-2053'>
<subrange length='16' type-id='type-id-106' id='type-id-1668'/>
</array-type-def>
@@ -34028,10 +34028,10 @@
<qualified-type-def type-id='type-id-2269' const='yes' id='type-id-2301'/>
<qualified-type-def type-id='type-id-2245' const='yes' id='type-id-2302'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functional.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/functional.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-2217' size-in-bits='64' id='type-id-2218'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-2303' size-in-bits='64' id='type-id-2304'/>
<qualified-type-def type-id='type-id-904' const='yes' id='type-id-2305'/>
<reference-type-def kind='lvalue' type-id='type-id-2305' size-in-bits='64' id='type-id-2306'/>
@@ -34843,7 +34843,7 @@
<return type-id='type-id-2352'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hash_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/hash_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2412' const='yes' id='type-id-2413'/>
<pointer-type-def type-id='type-id-2413' size-in-bits='64' id='type-id-2414'/>
<qualified-type-def type-id='type-id-2414' const='yes' id='type-id-2415'/>
@@ -34861,7 +34861,7 @@
<class-decl name='__hash_base<long unsigned int, long double>' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='50' column='1' id='type-id-2416'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hashtable_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/hashtable_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<namespace-decl name='__detail'>
<var-decl name='__prime_list' type-id='type-id-2417' mangled-name='_ZNSt8__detail12__prime_listE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/../shared/hashtable-aux.cc' line='30' column='1' elf-symbol-id='_ZNSt8__detail12__prime_listE@@GLIBCXX_3.4.10'/>
@@ -34871,7 +34871,7 @@
<subrange length='305' type-id='type-id-106' id='type-id-2418'/>
</array-type-def>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/limits.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/limits.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2419' const='yes' id='type-id-2420'/>
<qualified-type-def type-id='type-id-2421' const='yes' id='type-id-2422'/>
<namespace-decl name='std'>
@@ -36027,7 +36027,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<function-decl name='__once_proxy' mangled-name='__once_proxy' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__once_proxy@@GLIBCXX_3.4.11'>
<return type-id='type-id-5'/>
@@ -36036,7 +36036,7 @@
<var-decl name='__once_call' type-id='type-id-97' mangled-name='_ZSt11__once_call' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/mutex.cc' line='46' column='1' elf-symbol-id='_ZSt11__once_call@@GLIBCXX_3.4.11'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2439' const='yes' id='type-id-2440'/>
<qualified-type-def type-id='type-id-2441' const='yes' id='type-id-2442'/>
<qualified-type-def type-id='type-id-2443' const='yes' id='type-id-2444'/>
@@ -36129,7 +36129,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/regex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/regex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2497' const='yes' id='type-id-2498'/>
<pointer-type-def type-id='type-id-2498' size-in-bits='64' id='type-id-2499'/>
<pointer-type-def type-id='type-id-2497' size-in-bits='64' id='type-id-2500'/>
@@ -36177,7 +36177,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/shared_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/shared_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2501' const='yes' id='type-id-2502'/>
<pointer-type-def type-id='type-id-2502' size-in-bits='64' id='type-id-2503'/>
<pointer-type-def type-id='type-id-2501' size-in-bits='64' id='type-id-2504'/>
@@ -36214,7 +36214,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/string-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/string-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-589' const='yes' id='type-id-2505'/>
<qualified-type-def type-id='type-id-976' const='yes' id='type-id-2506'/>
<qualified-type-def type-id='type-id-433' const='yes' id='type-id-2507'/>
@@ -36303,7 +36303,7 @@
</namespace-decl>
<reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-2516'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/system_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/system_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-316' id='type-id-2517'/>
<reference-type-def kind='lvalue' type-id='type-id-324' size-in-bits='64' id='type-id-387'/>
<qualified-type-def type-id='type-id-325' const='yes' id='type-id-2518'/>
@@ -36325,7 +36325,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-680' id='type-id-2522'/>
<qualified-type-def type-id='type-id-684' id='type-id-2523'/>
<qualified-type-def type-id='type-id-685' const='yes' id='type-id-2524'/>
@@ -36370,7 +36370,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/wstring-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/wstring-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-474' const='yes' id='type-id-2536'/>
<qualified-type-def type-id='type-id-479' const='yes' id='type-id-2537'/>
<qualified-type-def type-id='type-id-460' const='yes' id='type-id-2538'/>
@@ -36457,9 +36457,9 @@
</namespace-decl>
<reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-2545'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/allocator-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/allocator-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='64' id='type-id-2546'>
<subrange length='8' type-id='type-id-106' id='type-id-1329'/>
</array-type-def>
@@ -37281,7 +37281,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1882' size-in-bits='832' id='type-id-1879'>
<subrange length='13' type-id='type-id-106' id='type-id-1883'/>
</array-type-def>
@@ -38528,7 +38528,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/complex_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/complex_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<type-decl name='complex double' size-in-bits='128' id='type-id-2767'/>
<type-decl name='complex float' size-in-bits='64' id='type-id-2768'/>
<type-decl name='complex long double' size-in-bits='256' id='type-id-2769'/>
@@ -40693,7 +40693,7 @@
<qualified-type-def type-id='type-id-2844' const='yes' id='type-id-2876'/>
<qualified-type-def type-id='type-id-2856' const='yes' id='type-id-2877'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/concept-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/concept-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-2878' size-in-bits='64' id='type-id-2879'/>
<qualified-type-def type-id='type-id-2879' const='yes' id='type-id-2880'/>
<pointer-type-def type-id='type-id-2881' size-in-bits='64' id='type-id-2882'/>
@@ -41250,7 +41250,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1024' id='type-id-1385'>
<subrange length='128' type-id='type-id-106' id='type-id-1518'/>
</array-type-def>
@@ -41576,7 +41576,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ext-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ext-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-716' size-in-bits='2944' id='type-id-2952'>
<subrange length='46' type-id='type-id-106' id='type-id-2953'/>
</array-type-def>
@@ -42237,7 +42237,7 @@
<class-decl name='_Rope_RopeSubstring<wchar_t, std::allocator<wchar_t> >' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3085'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/globals_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/globals_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1920' id='type-id-3086'>
<subrange length='240' type-id='type-id-106' id='type-id-3087'/>
</array-type-def>
@@ -42385,7 +42385,7 @@
</namespace-decl>
<qualified-type-def type-id='type-id-1331' const='yes' id='type-id-3102'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hash_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/hash_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-3107' const='yes' id='type-id-3108'/>
<pointer-type-def type-id='type-id-3108' size-in-bits='64' id='type-id-3109'/>
<qualified-type-def type-id='type-id-3109' const='yes' id='type-id-3110'/>
@@ -42477,7 +42477,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hashtable_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/hashtable_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-716' size-in-bits='19520' id='type-id-2417'>
<subrange length='305' type-id='type-id-106' id='type-id-2418'/>
</array-type-def>
@@ -42492,7 +42492,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1484' id='type-id-1230'/>
<reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1484'/>
<qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1485'/>
@@ -42527,7 +42527,7 @@
</namespace-decl>
<reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-3138'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-1156' size-in-bits='1024' id='type-id-1169'>
<subrange length='8' type-id='type-id-106' id='type-id-1329'/>
</array-type-def>
@@ -42620,12 +42620,12 @@
<return type-id='type-id-5'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_failure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_failure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1499'/>
<pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1150'/>
<pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1149'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-3141' size-in-bits='64' id='type-id-3142'/>
<qualified-type-def type-id='type-id-1163' const='yes' id='type-id-3143'/>
<reference-type-def kind='lvalue' type-id='type-id-3143' size-in-bits='64' id='type-id-3144'/>
@@ -42755,10 +42755,10 @@
</namespace-decl>
<qualified-type-def type-id='type-id-3142' const='yes' id='type-id-3147'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1220' id='type-id-1175'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/iostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/iostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-2051'/>
<namespace-decl name='std'>
<class-decl name='basic_iostream<wchar_t, std::char_traits<wchar_t> >' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2046'>
@@ -42860,7 +42860,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-378' id='type-id-3150'/>
<qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1622'/>
<pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1492'/>
@@ -43216,7 +43216,7 @@
<pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-3184'/>
<pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-3183'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1178' const='yes' id='type-id-3185'/>
<qualified-type-def type-id='type-id-1260' const='yes' id='type-id-3186'/>
<qualified-type-def type-id='type-id-575' const='yes' id='type-id-471'/>
@@ -43250,7 +43250,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-3187' id='type-id-3188'/>
<reference-type-def kind='lvalue' type-id='type-id-3189' size-in-bits='64' id='type-id-3187'/>
<pointer-type-def type-id='type-id-3189' size-in-bits='64' id='type-id-3190'/>
@@ -43308,7 +43308,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='88' id='type-id-1833'>
<subrange length='11' type-id='type-id-106' id='type-id-1863'/>
</array-type-def>
@@ -44043,7 +44043,7 @@
<return type-id='type-id-98'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-3257'>
<subrange length='2' type-id='type-id-106' id='type-id-1620'/>
</array-type-def>
@@ -44080,7 +44080,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-1857'>
<subrange length='14' type-id='type-id-106' id='type-id-1866'/>
</array-type-def>
@@ -44118,7 +44118,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1731' const='yes' id='type-id-1806'/>
<pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1834'/>
<pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1837'/>
@@ -49640,7 +49640,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/localename.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/localename.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-2516'/>
<qualified-type-def type-id='type-id-303' const='yes' id='type-id-3264'/>
<qualified-type-def type-id='type-id-306' id='type-id-3265'/>
@@ -49652,11 +49652,11 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_float.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_float.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_long_double.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_long_double.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/misc-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/misc-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-3142' const='yes' id='type-id-3147'/>
<qualified-type-def type-id='type-id-3146' const='yes' id='type-id-3266'/>
<qualified-type-def type-id='type-id-3101' const='yes' id='type-id-3267'/>
@@ -49701,7 +49701,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-3268' size-in-bits='64' id='type-id-3269'/>
<pointer-type-def type-id='type-id-3270' size-in-bits='64' id='type-id-3271'/>
<qualified-type-def type-id='type-id-3271' const='yes' id='type-id-3272'/>
@@ -50167,7 +50167,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1565' const='yes' id='type-id-3348'/>
<qualified-type-def type-id='type-id-1560' const='yes' id='type-id-1794'/>
<pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-1573'/>
@@ -50411,7 +50411,7 @@
</function-type>
<qualified-type-def type-id='type-id-210' const='yes' id='type-id-3359'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<typedef-decl name='uint64_t' type-id='type-id-53' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-3360'/>
<qualified-type-def type-id='type-id-3361' id='type-id-3362'/>
<reference-type-def kind='lvalue' type-id='type-id-3363' size-in-bits='64' id='type-id-3361'/>
@@ -50629,7 +50629,7 @@
<typedef-decl name='_SequenceIndex' type-id='type-id-3360' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='117' column='1' id='type-id-3373'/>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/pool_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/pool_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-3374' size-in-bits='1024' id='type-id-3375'>
<subrange length='16' type-id='type-id-106' id='type-id-1668'/>
</array-type-def>
@@ -50848,7 +50848,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/sstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/sstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-3416' const='yes' id='type-id-3417'/>
<pointer-type-def type-id='type-id-3417' size-in-bits='64' id='type-id-3418'/>
<qualified-type-def type-id='type-id-3418' const='yes' id='type-id-3419'/>
@@ -51401,7 +51401,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2269' const='yes' id='type-id-2301'/>
<pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-2295'/>
<qualified-type-def type-id='type-id-2245' const='yes' id='type-id-2302'/>
@@ -51778,7 +51778,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1494'/>
<qualified-type-def type-id='type-id-1215' id='type-id-1218'/>
<reference-type-def kind='lvalue' type-id='type-id-1494' size-in-bits='64' id='type-id-1215'/>
@@ -51792,7 +51792,7 @@
<reference-type-def kind='lvalue' type-id='type-id-1245' size-in-bits='64' id='type-id-1255'/>
<pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1252'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1330' id='type-id-1204'/>
<reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-1330'/>
<qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1495'/>
@@ -51814,7 +51814,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/strstream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/strstream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-210' const='yes' id='type-id-3359'/>
<pointer-type-def type-id='type-id-3359' size-in-bits='64' id='type-id-3358'/>
<qualified-type-def type-id='type-id-1516' const='yes' id='type-id-2052'/>
@@ -52636,7 +52636,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-2229' const='yes' id='type-id-2298'/>
<pointer-type-def type-id='type-id-2298' size-in-bits='64' id='type-id-2234'/>
<reference-type-def kind='lvalue' type-id='type-id-2300' size-in-bits='64' id='type-id-3516'/>
@@ -52722,7 +52722,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<pointer-type-def type-id='type-id-3522' size-in-bits='64' id='type-id-3523'/>
<pointer-type-def type-id='type-id-3524' size-in-bits='64' id='type-id-3525'/>
<pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-3526'/>
@@ -53417,7 +53417,7 @@
<return type-id='type-id-53'/>
</function-type>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-409' size-in-bits='352' id='type-id-1840'>
<subrange length='11' type-id='type-id-106' id='type-id-1863'/>
</array-type-def>
@@ -53993,7 +53993,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='atomicity.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='atomicity.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-450' volatile='yes' id='type-id-3700'/>
<pointer-type-def type-id='type-id-3700' size-in-bits='64' id='type-id-3701'/>
<namespace-decl name='__gnu_cxx'>
@@ -54009,7 +54009,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='basic_file.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='basic_file.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-32' size-in-bits='192' id='type-id-3702'>
<subrange length='3' type-id='type-id-106' id='type-id-3703'/>
</array-type-def>
@@ -54365,7 +54365,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='c++locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='c++locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1340' const='yes' id='type-id-3722'/>
<qualified-type-def type-id='type-id-3723' id='type-id-3724'/>
<reference-type-def kind='lvalue' type-id='type-id-3722' size-in-bits='64' id='type-id-3723'/>
@@ -54641,7 +54641,7 @@
<return type-id='type-id-1667'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='codecvt_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='codecvt_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<function-decl name='wcsnrtombs' filepath='/usr/include/wchar.h' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
<parameter type-id='type-id-98'/>
<parameter type-id='type-id-1084'/>
@@ -54666,7 +54666,7 @@
<return type-id='type-id-99'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='collate_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='collate_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1811'/>
<pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-1681'/>
<qualified-type-def type-id='type-id-1681' const='yes' id='type-id-1680'/>
@@ -54700,9 +54700,9 @@
<return type-id='type-id-99'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='ctype_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='ctype_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1390'/>
<pointer-type-def type-id='type-id-3728' size-in-bits='64' id='type-id-3729'/>
<namespace-decl name='std'>
@@ -54769,7 +54769,7 @@
<return type-id='type-id-6'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='messages_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='messages_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1648' const='yes' id='type-id-1813'/>
<pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1687'/>
<qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1815'/>
@@ -54790,7 +54790,7 @@
<return type-id='type-id-98'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<typedef-decl name='nl_item' type-id='type-id-6' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-3730'/>
<qualified-type-def type-id='type-id-1417' const='yes' id='type-id-1729'/>
<qualified-type-def type-id='type-id-1418' const='yes' id='type-id-1737'/>
@@ -54802,11 +54802,11 @@
<return type-id='type-id-98'/>
</function-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1413' const='yes' id='type-id-1758'/>
<qualified-type-def type-id='type-id-1425' const='yes' id='type-id-1765'/>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='time_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='time_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
<qualified-type-def type-id='type-id-1644' const='yes' id='type-id-1873'/>
<pointer-type-def type-id='type-id-1873' size-in-bits='64' id='type-id-1807'/>
<qualified-type-def type-id='type-id-1807' const='yes' id='type-id-1672'/>
diff --git a/tests/data/test-read-dwarf/test3.so.abi b/tests/data/test-read-dwarf/test3.so.abi
index 7357a740..a8e4c9fb 100644
--- a/tests/data/test-read-dwarf/test3.so.abi
+++ b/tests/data/test-read-dwarf/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test3.so' soname='test3.so.1'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -10,7 +10,7 @@
<elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' alias='foo__,__foo__,__foo' is-defined='yes'/>
<elf-symbol name='foo__' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
+ <abi-instr address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
<type-decl name='void' id='type-id-1'/>
<function-decl name='__foo' mangled-name='foo' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test3.c' line='8' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='foo'>
<return type-id='type-id-1'/>
diff --git a/tests/data/test-read-dwarf/test3.so.hash.abi b/tests/data/test-read-dwarf/test3.so.hash.abi
index e01f3959..bbb8ec20 100644
--- a/tests/data/test-read-dwarf/test3.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test3.so' soname='test3.so.1'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
@@ -10,7 +10,7 @@
<elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' alias='foo__,__foo__,__foo' is-defined='yes'/>
<elf-symbol name='foo__' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
+ <abi-instr address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
<type-decl name='void' id='48b5725f'/>
<function-decl name='__foo' mangled-name='foo' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test3.c' line='8' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='foo'>
<return type-id='48b5725f'/>
diff --git a/tests/data/test-read-dwarf/test4.so.abi b/tests/data/test-read-dwarf/test4.so.abi
index f5907099..451e90b6 100644
--- a/tests/data/test-read-dwarf/test4.so.abi
+++ b/tests/data/test-read-dwarf/test4.so.abi
@@ -1,11 +1,11 @@
-<abi-corpus path='data/test-read-dwarf/test4.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test4.so'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
<elf-function-symbols>
<elf-symbol name='cpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
+ <abi-instr address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test4.so.hash.abi b/tests/data/test-read-dwarf/test4.so.hash.abi
index 446df1da..52652bf7 100644
--- a/tests/data/test-read-dwarf/test4.so.hash.abi
+++ b/tests/data/test-read-dwarf/test4.so.hash.abi
@@ -1,11 +1,11 @@
-<abi-corpus path='data/test-read-dwarf/test4.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test4.so'>
<elf-needed>
<dependency name='libc.so.6'/>
</elf-needed>
<elf-function-symbols>
<elf-symbol name='cpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
+ <abi-instr address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
<type-decl name='char' size-in-bits='8' id='a84c031d'/>
<type-decl name='unsigned int' size-in-bits='32' id='f0981eeb'/>
<pointer-type-def type-id='a84c031d' size-in-bits='64' id='26a90f95'/>
diff --git a/tests/data/test-read-dwarf/test5.o.abi b/tests/data/test-read-dwarf/test5.o.abi
index feee01ff..be33eb82 100644
--- a/tests/data/test-read-dwarf/test5.o.abi
+++ b/tests/data/test-read-dwarf/test5.o.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test5.o'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test5.o'>
<elf-function-symbols>
<elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
<type-decl name='void' id='type-id-1'/>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
<function-decl name='bar' mangled-name='_Z3barPv' filepath='/home/dodji/libabigailtests/test.cc' line='2' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3barPv'>
diff --git a/tests/data/test-read-dwarf/test5.o.hash.abi b/tests/data/test-read-dwarf/test5.o.hash.abi
index 9ed9932a..e7dd68a1 100644
--- a/tests/data/test-read-dwarf/test5.o.hash.abi
+++ b/tests/data/test-read-dwarf/test5.o.hash.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test5.o'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test5.o'>
<elf-function-symbols>
<elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
<type-decl name='void' id='48b5725f'/>
<pointer-type-def type-id='48b5725f' size-in-bits='64' id='eaa32e2f'/>
<function-decl name='bar' mangled-name='_Z3barPv' filepath='/home/dodji/libabigailtests/test.cc' line='2' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3barPv'>
diff --git a/tests/data/test-read-dwarf/test6.so.abi b/tests/data/test-read-dwarf/test6.so.abi
index 65b32b2a..6b3d0460 100644
--- a/tests/data/test-read-dwarf/test6.so.abi
+++ b/tests/data/test-read-dwarf/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test6.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test6.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -16,7 +16,7 @@
<elf-symbol name='_ZN1CIiE3barE' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZZN1B3fooEvE1a' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<class-decl name='B' size-in-bits='8' is-struct='yes' visibility='default' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test6.cc' line='9' column='1' id='type-id-2'>
<member-function access='public'>
diff --git a/tests/data/test-read-dwarf/test6.so.hash.abi b/tests/data/test-read-dwarf/test6.so.hash.abi
index 376e5912..d7cb3b27 100644
--- a/tests/data/test-read-dwarf/test6.so.hash.abi
+++ b/tests/data/test-read-dwarf/test6.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test6.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test6.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -16,7 +16,7 @@
<elf-symbol name='_ZN1CIiE3barE' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZZN1B3fooEvE1a' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='95e97e5e'/>
<class-decl name='B' size-in-bits='8' is-struct='yes' visibility='default' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test6.cc' line='9' column='1' id='41d98c5d'>
<member-function access='public'>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index a5f3ff6c..845c7b9d 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test7.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test7.so'>
<elf-function-symbols>
<elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' id='type-id-3'>
<subrange length='7' type-id='type-id-4' id='type-id-5'/>
diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi
index a21810fe..7f3167d1 100644
--- a/tests/data/test-read-dwarf/test7.so.hash.abi
+++ b/tests/data/test-read-dwarf/test7.so.hash.abi
@@ -1,8 +1,8 @@
-<abi-corpus path='data/test-read-dwarf/test7.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test7.so'>
<elf-function-symbols>
<elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='char' size-in-bits='8' id='a84c031d'/>
<array-type-def dimensions='1' type-id='26a90f95' size-in-bits='448' id='0626c76e'>
<subrange length='7' type-id='4c87fef4' id='16fc326e'/>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
index 5822e79e..b3ce70af 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test8-qualified-this-pointer.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test8-qualified-this-pointer.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -10,7 +10,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='type-id-1'/>
<type-decl name='void' id='type-id-2'/>
<class-decl name='S' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf/test8-qualified-this-pointer.cc' line='1' column='1' id='type-id-3'>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
index d9af5bc1..87243ada 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test8-qualified-this-pointer.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test8-qualified-this-pointer.so'>
<elf-needed>
<dependency name='libstdc++.so.6'/>
<dependency name='libm.so.6'/>
@@ -10,7 +10,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
<type-decl name='int' size-in-bits='32' id='95e97e5e'/>
<type-decl name='void' id='48b5725f'/>
<class-decl name='S' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf/test8-qualified-this-pointer.cc' line='1' column='1' id='50d9a3fa'>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index 88844186..edc136b4 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus path='data/test-read-dwarf/test9-pr18818-clang.so'>
+<abi-corpus version='2.0' path='data/test-read-dwarf/test9-pr18818-clang.so'>
<elf-needed>
<dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
<dependency name='libm.so.6'/>
@@ -346,7 +346,7 @@
<elf-symbol name='_ZTVN5boost6system12system_errorE' size='40' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
@@ -1840,7 +1840,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<array-type-def dimensions='1' type-id='type-id-142' size-in-bits='infinite' id='type-id-143'>
<subrange length='infinite' type-id='type-id-4' id='type-id-137'/>
</array-type-def>
@@ -4788,7 +4788,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-413' size-in-bits='64' id='type-id-414'/>
<pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-415'/>
<reference-type-def kind='lvalue' type-id='type-id-416' size-in-bits='64' id='type-id-417'/>
@@ -5006,7 +5006,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
<pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-457'/>
<qualified-type-def type-id='type-id-455' const='yes' id='type-id-458'/>
@@ -5138,7 +5138,7 @@
</function-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<namespace-decl name='std'>
<function-decl name='operator!=<char, std::char_traits<char>, std::allocator<char> >' mangled-name='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
<parameter type-id='type-id-298' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
@@ -5175,7 +5175,7 @@
</namespace-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<reference-type-def kind='lvalue' type-id='type-id-483' size-in-bits='64' id='type-id-484'/>
<pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-485'/>
<pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-355'/>
@@ -5265,7 +5265,7 @@
</class-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
<type-decl name='unsigned char' size-in-bits='8' id='type-id-499'/>
<class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-24'>
<data-member access='public' layout-offset-in-bits='0'>
@@ -5492,6 +5492,6 @@
</enum-decl>
</namespace-decl>
</abi-instr>
- <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
</abi-instr>
</abi-corpus>
diff --git a/tests/data/test-read-write/test0.xml b/tests/data/test-read-write/test0.xml
index 6f431114..397bf24a 100644
--- a/tests/data/test-read-write/test0.xml
+++ b/tests/data/test-read-write/test0.xml
@@ -1,3 +1,3 @@
-<abi-instr version='1.0' path='data/test-read-write/test0.xml'>
+<abi-instr path='data/test-read-write/test0.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
</abi-instr>
diff --git a/tests/data/test-read-write/test1.xml b/tests/data/test-read-write/test1.xml
index cf91c295..f0523a0a 100644
--- a/tests/data/test-read-write/test1.xml
+++ b/tests/data/test-read-write/test1.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test1.xml'>
+<abi-instr path='data/test-read-write/test1.xml'>
<namespace-decl name='foo'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
</namespace-decl>
diff --git a/tests/data/test-read-write/test10.xml b/tests/data/test-read-write/test10.xml
index e539b7e7..838c9d63 100644
--- a/tests/data/test-read-write/test10.xml
+++ b/tests/data/test-read-write/test10.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test10.xml'>
+<abi-instr path='data/test-read-write/test10.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test11.xml b/tests/data/test-read-write/test11.xml
index 4720f4c4..5f4b0583 100644
--- a/tests/data/test-read-write/test11.xml
+++ b/tests/data/test-read-write/test11.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test11.xml'>
+<abi-instr path='data/test-read-write/test11.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<namespace-decl name='ns0'>
<function-template-decl id='fn-tmpl-id-2'>
diff --git a/tests/data/test-read-write/test12.xml b/tests/data/test-read-write/test12.xml
index 76e1cfa0..b075b81f 100644
--- a/tests/data/test-read-write/test12.xml
+++ b/tests/data/test-read-write/test12.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test12.xml'>
+<abi-instr path='data/test-read-write/test12.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<namespace-decl name='ns0'>
<namespace-decl name='ns1'>
diff --git a/tests/data/test-read-write/test13.xml b/tests/data/test-read-write/test13.xml
index 42cad52b..c605100d 100644
--- a/tests/data/test-read-write/test13.xml
+++ b/tests/data/test-read-write/test13.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test13.xml'>
+<abi-instr path='data/test-read-write/test13.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<namespace-decl name='ns0'>
<namespace-decl name='ns1'>
diff --git a/tests/data/test-read-write/test14.xml b/tests/data/test-read-write/test14.xml
index 248f203b..1a406e29 100644
--- a/tests/data/test-read-write/test14.xml
+++ b/tests/data/test-read-write/test14.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test14.xml'>
+<abi-instr path='data/test-read-write/test14.xml'>
<class-decl name='S' size-in-bits='8' alignment-in-bits='8' visibility='default' id='type-id-1'>
<member-template access='public'>
<function-template-decl id='fn-tmpl-id-2'>
diff --git a/tests/data/test-read-write/test15.xml b/tests/data/test-read-write/test15.xml
index 8e7230d8..47cd508d 100644
--- a/tests/data/test-read-write/test15.xml
+++ b/tests/data/test-read-write/test15.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test15.xml'>
+<abi-instr path='data/test-read-write/test15.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<class-template-decl id='class-tmpl-id-2'>
<template-type-parameter id='type-id-3' name='T'/>
diff --git a/tests/data/test-read-write/test16.xml b/tests/data/test-read-write/test16.xml
index 2141db43..7218c5a3 100644
--- a/tests/data/test-read-write/test16.xml
+++ b/tests/data/test-read-write/test16.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test16.xml'>
+<abi-instr path='data/test-read-write/test16.xml'>
<class-decl name='S' size-in-bits='8' alignment-in-bits='8' visibility='default' id='type-id-1'>
<member-template access='public'>
<class-template-decl id='class-tmpl-id-2'>
diff --git a/tests/data/test-read-write/test17.xml b/tests/data/test-read-write/test17.xml
index 9e3bcd63..2b4344ea 100644
--- a/tests/data/test-read-write/test17.xml
+++ b/tests/data/test-read-write/test17.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test17.xml'>
+<abi-instr path='data/test-read-write/test17.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
<type-decl name='unsigned int' size-in-bits='32' alignment-in-bits='32' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test18.xml b/tests/data/test-read-write/test18.xml
index 7e80d81a..01a535a8 100644
--- a/tests/data/test-read-write/test18.xml
+++ b/tests/data/test-read-write/test18.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test18.xml'>
+<abi-instr path='data/test-read-write/test18.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='void' alignment-in-bits='8' id='type-id-2'/>
<class-decl name='S' size-in-bits='8' alignment-in-bits='8' visibility='default' filepath='../../prtests/test8.cc' line='1' column='8' id='type-id-3'>
diff --git a/tests/data/test-read-write/test19.xml b/tests/data/test-read-write/test19.xml
index 25823a7e..a502addd 100644
--- a/tests/data/test-read-write/test19.xml
+++ b/tests/data/test-read-write/test19.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test19.xml'>
+<abi-instr path='data/test-read-write/test19.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<type-decl name='void' alignment-in-bits='8' id='type-id-2'/>
<class-decl name='B0' size-in-bits='32' alignment-in-bits='32' visibility='default' filepath='../../prtests/test9.cc' line='1' column='7' id='type-id-3'>
diff --git a/tests/data/test-read-write/test2.xml b/tests/data/test-read-write/test2.xml
index ab768241..1c7251bf 100644
--- a/tests/data/test-read-write/test2.xml
+++ b/tests/data/test-read-write/test2.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test2.xml'>
+<abi-instr path='data/test-read-write/test2.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<namespace-decl name='bar'>
<type-decl name='int32' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
diff --git a/tests/data/test-read-write/test20.xml b/tests/data/test-read-write/test20.xml
index acd23e68..be98cae6 100644
--- a/tests/data/test-read-write/test20.xml
+++ b/tests/data/test-read-write/test20.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test20.xml'>
+<abi-instr path='data/test-read-write/test20.xml'>
<class-decl name='__class_type_info_pseudo' size-in-bits='128' alignment-in-bits='64' visibility='default' id='type-id-1'/>
<class-decl name='__vmi_class_type_info_pseudo3' size-in-bits='576' alignment-in-bits='64' visibility='default' id='type-id-2'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test21.xml b/tests/data/test-read-write/test21.xml
index bf3a53f3..a8ac9ded 100644
--- a/tests/data/test-read-write/test21.xml
+++ b/tests/data/test-read-write/test21.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test21.xml'>
+<abi-instr path='data/test-read-write/test21.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<type-decl name='void' alignment-in-bits='8' id='type-id-2'/>
<class-decl name='S' size-in-bits='32' alignment-in-bits='32' visibility='default' filepath='simple-class-0.C' line='5' column='8' id='type-id-3'>
diff --git a/tests/data/test-read-write/test22.xml b/tests/data/test-read-write/test22.xml
index 3831ec2e..36549ff2 100644
--- a/tests/data/test-read-write/test22.xml
+++ b/tests/data/test-read-write/test22.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test22.xml'>
+<abi-instr path='data/test-read-write/test22.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
<type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test23.xml b/tests/data/test-read-write/test23.xml
index 6fa9f166..59c22bee 100644
--- a/tests/data/test-read-write/test23.xml
+++ b/tests/data/test-read-write/test23.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' address-size='64' path='data/test-read-write/test23.xml'>
+<abi-instr address-size='64' path='data/test-read-write/test23.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
<type-decl name='long int' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test24.xml b/tests/data/test-read-write/test24.xml
index 9de704fb..bbeed98d 100644
--- a/tests/data/test-read-write/test24.xml
+++ b/tests/data/test-read-write/test24.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test24.xml'>
+<abi-instr path='data/test-read-write/test24.xml'>
<type-decl name='char' size-in-bits='8' id='type-id-1'/>
<type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
<pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test25.xml b/tests/data/test-read-write/test25.xml
index ab842011..8f6ad94f 100644
--- a/tests/data/test-read-write/test25.xml
+++ b/tests/data/test-read-write/test25.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' address-size='64' path='data/text-read-write/test25.xml'>
+<abi-instr address-size='64' path='data/text-read-write/test25.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' alignment-in-bits='64' id='type-id-3'>
<subrange length='7' id='type-id-4'/>
diff --git a/tests/data/test-read-write/test26.xml b/tests/data/test-read-write/test26.xml
index b99e92c9..27f8acd2 100644
--- a/tests/data/test-read-write/test26.xml
+++ b/tests/data/test-read-write/test26.xml
@@ -1,10 +1,10 @@
-<abi-corpus path='libtest-v0.so'>
+<abi-corpus version='2.0' path='libtest-v0.so'>
<elf-function-symbols>
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test-v0.c'>
+ <abi-instr address-size='64' path='test-v0.c'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<type-decl name='void' id='type-id-2'/>
<class-decl name='public_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/tests/test-interfaces-v0.h' line='2' column='1' id='type-id-3'>
diff --git a/tests/data/test-read-write/test27.xml b/tests/data/test-read-write/test27.xml
index 0cb65c29..92d0e043 100644
--- a/tests/data/test-read-write/test27.xml
+++ b/tests/data/test-read-write/test27.xml
@@ -1,4 +1,4 @@
-<abi-corpus path='repr7' architecture='elf-amd-x86_64'>
+<abi-corpus version='2.0' path='repr7' architecture='elf-amd-x86_64'>
<elf-function-symbols>
<elf-symbol name='_Z2fni' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
@@ -6,7 +6,7 @@
<elf-symbol name='fnptr0' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='fnptr1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-variable-symbols>
- <abi-instr version='1.0' address-size='64' path='../../../repr7.cc' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='../../../repr7.cc' language='LANG_C_plus_plus'>
<type-decl name='double' size-in-bits='64' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' id='type-id-2'/>
<type-decl name='void' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test28-without-std-fns-ref.xml b/tests/data/test-read-write/test28-without-std-fns-ref.xml
index b46f688f..8ca08e21 100644
--- a/tests/data/test-read-write/test28-without-std-fns-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-fns-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.0' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -11,7 +11,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
diff --git a/tests/data/test-read-write/test28-without-std-vars-ref.xml b/tests/data/test-read-write/test28-without-std-vars-ref.xml
index 2871a057..b92d9c3f 100644
--- a/tests/data/test-read-write/test28-without-std-vars-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-vars-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.0' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
<elf-needed>
<dependency name='libgcc_s.so.1'/>
<dependency name='libc.so.6'/>
@@ -11,7 +11,7 @@
<elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
</elf-function-symbols>
- <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+ <abi-instr address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
<type-decl name='bool' size-in-bits='8' id='type-id-1'/>
<type-decl name='char' size-in-bits='8' id='type-id-2'/>
<class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-3'>
diff --git a/tests/data/test-read-write/test3.xml b/tests/data/test-read-write/test3.xml
index 8a07ce29..0436bf70 100644
--- a/tests/data/test-read-write/test3.xml
+++ b/tests/data/test-read-write/test3.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test3.xml'>
+<abi-instr path='data/test-read-write/test3.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
<qualified-type-def type-id='type-id-1' const='yes' volatile='yes' id='type-id-3'/>
diff --git a/tests/data/test-read-write/test4.xml b/tests/data/test-read-write/test4.xml
index 943dca5d..17324289 100644
--- a/tests/data/test-read-write/test4.xml
+++ b/tests/data/test-read-write/test4.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test4.xml'>
+<abi-instr path='data/test-read-write/test4.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
</abi-instr>
diff --git a/tests/data/test-read-write/test5.xml b/tests/data/test-read-write/test5.xml
index 9ea75fbf..4c07fa06 100644
--- a/tests/data/test-read-write/test5.xml
+++ b/tests/data/test-read-write/test5.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test5.xml'>
+<abi-instr path='data/test-read-write/test5.xml'>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-1'/>
<reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
</abi-instr>
diff --git a/tests/data/test-read-write/test6.xml b/tests/data/test-read-write/test6.xml
index c3d53cea..b0fd6634 100644
--- a/tests/data/test-read-write/test6.xml
+++ b/tests/data/test-read-write/test6.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test6.xml'>
+<abi-instr path='data/test-read-write/test6.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<enum-decl name='enum_foo' id='type-id-2'>
<underlying-type type-id='type-id-1'/>
diff --git a/tests/data/test-read-write/test7.xml b/tests/data/test-read-write/test7.xml
index 0497126b..6b2d4eea 100644
--- a/tests/data/test-read-write/test7.xml
+++ b/tests/data/test-read-write/test7.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test7.xml'>
+<abi-instr path='data/test-read-write/test7.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<typedef-decl name='tchar' type-id='type-id-1' id='type-id-2'/>
</abi-instr>
diff --git a/tests/data/test-read-write/test8.xml b/tests/data/test-read-write/test8.xml
index 09c335d9..4e18e813 100644
--- a/tests/data/test-read-write/test8.xml
+++ b/tests/data/test-read-write/test8.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test8.xml'>
+<abi-instr path='data/test-read-write/test8.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<var-decl name='foo' type-id='type-id-1' mangled-name='blabla' visibility='default' binding='global'/>
</abi-instr>
diff --git a/tests/data/test-read-write/test9.xml b/tests/data/test-read-write/test9.xml
index acf0cf25..70356f6d 100644
--- a/tests/data/test-read-write/test9.xml
+++ b/tests/data/test-read-write/test9.xml
@@ -1,4 +1,4 @@
-<abi-instr version='1.0' path='data/test-read-write/test9.xml'>
+<abi-instr path='data/test-read-write/test9.xml'>
<type-decl name='char' size-in-bits='8' alignment-in-bits='8' id='type-id-1'/>
<type-decl name='int' size-in-bits='32' alignment-in-bits='32' id='type-id-2'/>
<pointer-type-def type-id='type-id-2' size-in-bits='64' alignment-in-bits='64' id='type-id-3'/>
diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 666f8d57..f0820de2 100644
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -1005,6 +1005,26 @@ handle_error(abigail::dwarf_reader::status status_code,
return abigail::tools_utils::ABIDIFF_OK;
}
+/// Emit an error message saying that the two files have incompatible
+/// format versions.
+///
+/// @param file_path1 the first file path to consider.
+///
+/// @param file_path2 the second file path to consider.
+///
+/// @param prog_name the name of the current program.
+static void
+emit_incompatible_format_version_error_message(const string& file_path1,
+ const string& file_path2,
+ const string& prog_name)
+{
+ emit_prefix(prog_name, cerr)
+ << "incompatible format version between the two input files:\n"
+ << "'" << file_path1 << "'\n"
+ << "and\n"
+ << "'" << file_path2 << "'\n" ;
+}
+
int
main(int argc, char* argv[])
{
@@ -1286,6 +1306,15 @@ main(int argc, char* argv[])
return abigail::tools_utils::ABIDIFF_OK;
}
+ if (c1->get_format_major_version_number()
+ != c2->get_format_major_version_number())
+ {
+ emit_incompatible_format_version_error_message(opts.file1,
+ opts.file2,
+ argv[0]);
+ return abigail::tools_utils::ABIDIFF_ERROR;
+ }
+
set_corpus_keep_drop_regex_patterns(opts, c1);
set_corpus_keep_drop_regex_patterns(opts, c2);
@@ -1308,6 +1337,15 @@ main(int argc, char* argv[])
return abigail::tools_utils::ABIDIFF_OK;
}
+ if (g1->get_format_major_version_number()
+ != g2->get_format_major_version_number())
+ {
+ emit_incompatible_format_version_error_message(opts.file1,
+ opts.file2,
+ argv[0]);
+ return abigail::tools_utils::ABIDIFF_ERROR;
+ }
+
adjust_diff_context_for_kmidiff(*ctxt);
corpus_diff_sptr diff = compute_diff(g1, g2, ctxt);
--
2.30.0
--
Dodji
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-01 13:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 13:34 [PATCH] Bump ABIXML format version to 2.0 Dodji Seketeli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).