mbox series

[GIT,PULL] Refactor (k)symtab reader

Message ID YGHT0p3jzY3oORUQ@google.com
State Committed
Headers show
Series [GIT,PULL] Refactor (k)symtab reader | expand

Pull-request

ssh://sourceware.org/git/libabigail.git mm-symtab-reader

Message

Matthias Maennich March 29, 2021, 1:19 p.m. UTC
Hi Dodji,

This is technically v4 of the symtab reader series. I addressed all the
requests from the review and since they were mostly about style, I did
not send out the series again. Instead I staged the version at the
sourceware git for you to merge (or fast-forward) directly.

There is a new tiny commit that enhances the .clang-format file to
create better matching style and obviously. I folded the relevant ARM32
patch into the first commit of the series.

I omitted the commits that were already merged. I also attached the full
inter-diff between v3 and v4 for your reference.

Cheers,
Matthias

---

So, please pull:

The following changes since commit 2eefd1727663285fe3544c41ec01dea32b2ec7dd:

   Bug 27569 - abidiff misses a function parameter addition (2021-03-29 12:34:48 +0200)

are available in the Git repository at:

   ssh://sourceware.org/git/libabigail.git mm-symtab-reader

for you to fetch changes up to 6be21667a07e261dc9779271048c219232c1b911:

   symtab: Add support for MODVERSIONS (CRC checksums) (2021-03-29 13:39:56 +0100)

----------------------------------------------------------------
Giuliano Procida (1):
       abg-writer.cc: fix write_elf_symbol_reference loop

Matthias Maennich (16):
       clang-format: Minor correction to not break parameters on the first line
       Refactor ELF symbol table reading by adding a new symtab reader
       Integrate new symtab reader into corpus and read_context
       corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab
       corpus: make get_unreferenced_(function|variable)_symbols use the new symtab
       abg-reader: avoid using the (var|function)_symbol_map
       dwarf-reader: read_context: use new symtab in *_symbols_is_exported
       Switch kernel stuff over to new symtab and drop unused code
       abg-elf-helpers: migrate ppc64 specific helpers
       symtab_reader: add support for ppc64 ELFv1 binaries
       abg-corpus: remove symbol maps and their setters
       dwarf reader: drop (now) unused code related to symbol table reading
       test-symtab: add tests for whitelisted functions
       symtab/dwarf-reader: allow hinting of main symbols for aliases
       dwarf-reader/writer: consider aliases when dealing with suppressions
       symtab: Add support for MODVERSIONS (CRC checksums)

  .clang-format                                      |    3 +-
  include/abg-corpus.h                               |   24 +-
  include/abg-dwarf-reader.h                         |    6 -
  include/abg-fwd.h                                  |    9 +
  include/abg-ir.h                                   |   11 +
  src/abg-comp-filter.cc                             |   39 +-
  src/abg-corpus-priv.h                              |   57 +-
  src/abg-corpus.cc                                  |  637 +++--
  src/abg-dwarf-reader.cc                            | 2453 ++------------------
  src/abg-elf-helpers.cc                             |  186 ++
  src/abg-elf-helpers.h                              |    8 +
  src/abg-ir.cc                                      |   79 +-
  src/abg-reader.cc                                  |   57 +-
  src/abg-reporter-priv.cc                           |   18 +-
  src/abg-symtab-reader.cc                           |  543 +++++
  src/abg-symtab-reader.h                            |  314 ++-
  src/abg-tools-utils.cc                             |   13 -
  src/abg-writer.cc                                  |   68 +-
  tests/data/Makefile.am                             |   38 +-
  .../test-abicompat/test5-fn-changed-report-0.txt   |    4 -
  .../test-abicompat/test5-fn-changed-report-1.txt   |    4 -
  tests/data/test-abidiff-exit/test-crc-report.txt   |   15 +
  tests/data/test-abidiff-exit/test-crc-v0.abi       |   29 +
  tests/data/test-abidiff-exit/test-crc-v1.abi       |   30 +
  .../test-missing-alias-report.txt                  |    0
  .../data/test-abidiff-exit/test-missing-alias.abi  |   12 +
  .../test-abidiff-exit/test-missing-alias.suppr     |    4 +
  ...166-libtirpc.so.report.txt => empty-report.txt} |    0
  tests/data/test-abidiff/test-PR24552-report0.txt   |    3 -
  tests/data/test-abidiff/test-crc-0.xml             | 1601 +++++++++++++
  tests/data/test-abidiff/test-crc-1.xml             | 1601 +++++++++++++
  tests/data/test-abidiff/test-crc-2.xml             | 1601 +++++++++++++
  tests/data/test-abidiff/test-crc-report.txt        |    9 +
  .../data/test-abidiff/test-empty-corpus-report.txt |    3 -
  tests/data/test-annotate/test15-pr18892.so.abi     |  918 ++++----
  .../test19-pr19023-libtcmalloc_and_profiler.so.abi |   60 +-
  tests/data/test-annotate/test2.so.abi              |   12 +-
  tests/data/test-annotate/test3.so.abi              |    6 +-
  tests/data/test-diff-dwarf/test12-report.txt       |    7 +
  .../test36-ppc64-aliases-report-0.txt              |    4 +-
  .../test42-PR21296-clanggcc-report0.txt            |    6 +-
  .../test-diff-filter/test-PR27569-report-0.txt     |    2 +
  .../test31-pr18535-libstdc++-report-0.txt          |    6 +-
  .../test31-pr18535-libstdc++-report-1.txt          |    6 +-
  ...64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt |    6 +-
  ...64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt |    6 +-
  .../test-diff-suppr/test23-alias-filter-4.suppr    |    2 +-
  .../test23-alias-filter-report-0.txt               |    4 +-
  .../test23-alias-filter-report-2.txt               |    4 +-
  tests/data/test-diff-suppr/test31-report-0.txt     |    3 +
  tests/data/test-diff-suppr/test32-report-1.txt     |    2 +-
  .../PR22015-libboost_iostreams.so.abi              |   48 +-
  tests/data/test-read-dwarf/PR22122-libftdc.so.abi  |    6 +-
  tests/data/test-read-dwarf/PR25007-sdhci.ko.abi    |   77 +-
  .../data/test-read-dwarf/libtest24-drop-fns.so.abi |  314 +--
  tests/data/test-read-dwarf/test-suppressed-alias.c |   16 +
  tests/data/test-read-dwarf/test-suppressed-alias.o |  Bin 0 -> 2848 bytes
  .../test-read-dwarf/test-suppressed-alias.o.abi    |   16 +
  .../test-read-dwarf/test-suppressed-alias.suppr    |    7 +
  .../data/test-read-dwarf/test10-pr18818-gcc.so.abi |  192 +-
  tests/data/test-read-dwarf/test11-pr18828.so.abi   |  516 ++--
  tests/data/test-read-dwarf/test12-pr18844.so.abi   |   66 +-
  tests/data/test-read-dwarf/test15-pr18892.so.abi   |  918 ++++----
  tests/data/test-read-dwarf/test16-pr18904.so.abi   |  990 ++++----
  .../test19-pr19023-libtcmalloc_and_profiler.so.abi |   60 +-
  tests/data/test-read-dwarf/test2.so.abi            |   12 +-
  tests/data/test-read-dwarf/test2.so.hash.abi       |   12 +-
  .../test22-pr19097-libstdc++.so.6.0.17.so.abi      | 1042 ++++-----
  .../data/test-read-dwarf/test3-alias-1.so.hash.abi |   14 +
  tests/data/test-read-dwarf/test3-alias-1.suppr     |    3 +
  .../data/test-read-dwarf/test3-alias-2.so.hash.abi |   18 +
  tests/data/test-read-dwarf/test3-alias-2.suppr     |    3 +
  .../data/test-read-dwarf/test3-alias-3.so.hash.abi |   14 +
  tests/data/test-read-dwarf/test3-alias-3.suppr     |    3 +
  .../data/test-read-dwarf/test3-alias-4.so.hash.abi |    8 +
  tests/data/test-read-dwarf/test3-alias-4.suppr     |    3 +
  tests/data/test-read-dwarf/test3.so.abi            |    6 +-
  tests/data/test-read-dwarf/test3.so.hash.abi       |    6 +-
  tests/data/test-read-write/test-crc.xml            |   10 +
  tests/data/test-symtab/basic/aliases.c             |   13 +
  tests/data/test-symtab/basic/aliases.so            |  Bin 0 -> 17176 bytes
  tests/data/test-symtab/basic/no_debug_info.c       |    2 +-
  tests/data/test-symtab/basic/no_debug_info.so      |  Bin 15360 -> 15544 bytes
  .../basic/one_function_one_variable_all.whitelist  |    3 +
  .../one_function_one_variable_function.whitelist   |    2 +
  .../one_function_one_variable_irrelevant.whitelist |    2 +
  .../one_function_one_variable_variable.whitelist   |    2 +
  tests/data/test-symtab/kernel-modversions/Makefile |   19 +
  .../test-symtab/kernel-modversions/one_of_each.c   |    1 +
  .../test-symtab/kernel-modversions/one_of_each.ko  |  Bin 0 -> 131760 bytes
  tests/test-abidiff-exit.cc                         |   22 +
  tests/test-abidiff.cc                              |   34 +-
  tests/test-read-dwarf.cc                           |   40 +
  tests/test-read-write.cc                           |    6 +
  tests/test-symtab.cc                               |  188 +-
  tools/abidw.cc                                     |    2 -
  96 files changed, 9832 insertions(+), 5417 deletions(-)
  create mode 100644 tests/data/test-abidiff-exit/test-crc-report.txt
  create mode 100644 tests/data/test-abidiff-exit/test-crc-v0.abi
  create mode 100644 tests/data/test-abidiff-exit/test-crc-v1.abi
  create mode 100644 tests/data/test-abidiff-exit/test-missing-alias-report.txt
  create mode 100644 tests/data/test-abidiff-exit/test-missing-alias.abi
  create mode 100644 tests/data/test-abidiff-exit/test-missing-alias.suppr
  rename tests/data/test-abidiff/{test-PR18166-libtirpc.so.report.txt => empty-report.txt} (100%)
  delete mode 100644 tests/data/test-abidiff/test-PR24552-report0.txt
  create mode 100644 tests/data/test-abidiff/test-crc-0.xml
  create mode 100644 tests/data/test-abidiff/test-crc-1.xml
  create mode 100644 tests/data/test-abidiff/test-crc-2.xml
  create mode 100644 tests/data/test-abidiff/test-crc-report.txt
  delete mode 100644 tests/data/test-abidiff/test-empty-corpus-report.txt
  create mode 100644 tests/data/test-read-dwarf/test-suppressed-alias.c
  create mode 100644 tests/data/test-read-dwarf/test-suppressed-alias.o
  create mode 100644 tests/data/test-read-dwarf/test-suppressed-alias.o.abi
  create mode 100644 tests/data/test-read-dwarf/test-suppressed-alias.suppr
  create mode 100644 tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
  create mode 100644 tests/data/test-read-dwarf/test3-alias-1.suppr
  create mode 100644 tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
  create mode 100644 tests/data/test-read-dwarf/test3-alias-2.suppr
  create mode 100644 tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
  create mode 100644 tests/data/test-read-dwarf/test3-alias-3.suppr
  create mode 100644 tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
  create mode 100644 tests/data/test-read-dwarf/test3-alias-4.suppr
  create mode 100644 tests/data/test-read-write/test-crc.xml
  create mode 100644 tests/data/test-symtab/basic/aliases.c
  create mode 100755 tests/data/test-symtab/basic/aliases.so
  create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_all.whitelist
  create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_function.whitelist
  create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_irrelevant.whitelist
  create mode 100644 tests/data/test-symtab/basic/one_function_one_variable_variable.whitelist
  create mode 100644 tests/data/test-symtab/kernel-modversions/Makefile
  create mode 120000 tests/data/test-symtab/kernel-modversions/one_of_each.c
  create mode 100644 tests/data/test-symtab/kernel-modversions/one_of_each.ko

---

Range-Diff between v3 and v3
----------------------------

  -:  ------------ >  1:  4f997ce9e4cb clang-format: Minor correction to not break parameters on the first line
  1:  c6a596e02f78 !  2:  af33bfb78470 Refactor ELF symbol table reading by adding a new symtab reader
     @@ Commit message
                  (symtab::load_): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-symtab-reader.cc ##
     @@ src/abg-symtab-reader.cc: namespace abigail
      +{
      +  bool
      +  operator()(const elf_symbol_sptr& left, const elf_symbol_sptr& right)
     -+  { return left->get_id_string() < right->get_id_string(); }
     ++  {return left->get_id_string() < right->get_id_string();}
      +} symbol_sort;
      +
      +/// Construct a symtab object and instantiate from an ELF handle. Also pass
      +/// in an ir::environment handle to interact with the context we are living
      +/// in. If specified, the symbol_predicate will be respected when creating
      +/// the full vector of symbols.
     ++///
     ++/// @param elf_handle the elf handle to load the symbol table from
     ++///
     ++/// @param env the environment we are operating in
     ++///
     ++/// @param is_suppressed a predicate function to determine if a symbol should
     ++/// be suppressed
     ++///
     ++/// @return a smart pointer handle to symtab, set to nullptr if the load was
     ++/// not completed
      +symtab_ptr
      +symtab::load(Elf*	      elf_handle,
      +	     ir::environment* env,
     @@ src/abg-symtab-reader.cc: namespace abigail
      +
      +/// Construct a symtab object from existing name->symbol lookup maps.
      +/// They were possibly read from a different representation (XML maybe).
     ++///
     ++/// @param function_symbol_map a map from ELF function name to elf_symbol
     ++///
     ++/// @param variable_symbol_map a map from ELF variable name to elf_symbol
     ++///
     ++/// @return a smart pointer handle to symtab, set to nullptr if the load was
     ++/// not completed
      +symtab_ptr
      +symtab::load(string_elf_symbols_map_sptr function_symbol_map,
      +	     string_elf_symbols_map_sptr variables_symbol_map)
     @@ src/abg-symtab-reader.cc: namespace abigail
      +  return result;
      +}
      +
     -+symtab::symtab() : is_kernel_binary_(false), has_ksymtab_entries_(false) {}
     ++symtab::symtab()
     ++  : is_kernel_binary_(false), has_ksymtab_entries_(false)
     ++{}
      +
      +/// Load the symtab representation from an Elf binary presented to us by an
      +/// Elf* handle.
     @@ src/abg-symtab-reader.cc: namespace abigail
      +/// Symbols that are suppressed will be omitted from the symbols_ vector, but
      +/// still be discoverable through the name->symbol and addr->symbol lookup
      +/// maps.
     ++///
     ++/// @param elf_handle the elf handle to load the symbol table from
     ++///
     ++/// @param env the environment we are operating in
     ++///
     ++/// @param is_suppressed a predicate function to determine if a symbol should
     ++/// be suppressed
     ++///
     ++/// @return true if the load succeeded
      +bool
      +symtab::load_(Elf*	       elf_handle,
      +	      ir::environment* env,
     @@ src/abg-symtab-reader.cc: namespace abigail
      +  const bool is_kernel = elf_helpers::is_linux_kernel(elf_handle);
      +  std::unordered_set<std::string> exported_kernel_symbols;
      +
     ++  const bool is_arm32 = elf_helpers::architecture_is_arm32(elf_handle);
     ++
      +  for (size_t i = 0; i < number_syms; ++i)
      +    {
      +      GElf_Sym *sym, sym_mem;
     @@ src/abg-symtab-reader.cc: namespace abigail
      +      elf_symbol::version ver;
      +      elf_helpers::get_version_for_symbol(elf_handle, i, sym_is_defined, ver);
      +
     -+      const elf_symbol_sptr& symbol_sptr = elf_symbol::create(
     -+	  env, i, sym->st_size, name,
     -+	  elf_helpers::stt_to_elf_symbol_type(GELF_ST_TYPE(sym->st_info)),
     -+	  elf_helpers::stb_to_elf_symbol_binding(GELF_ST_BIND(sym->st_info)),
     -+	  sym_is_defined, sym_is_common, ver,
     -+	  elf_helpers::stv_to_elf_symbol_visibility(
     -+	      GELF_ST_VISIBILITY(sym->st_other)),
     -+	  false); // TODO: is_linux_strings_cstr
     ++      const elf_symbol_sptr& symbol_sptr =
     ++	elf_symbol::create
     ++	(env, i, sym->st_size, name,
     ++	 elf_helpers::stt_to_elf_symbol_type(GELF_ST_TYPE(sym->st_info)),
     ++	 elf_helpers::stb_to_elf_symbol_binding(GELF_ST_BIND(sym->st_info)),
     ++	 sym_is_defined, sym_is_common, ver,
     ++	 elf_helpers::stv_to_elf_symbol_visibility
     ++	 (GELF_ST_VISIBILITY(sym->st_other)),
     ++	 /*is_linux_strings_cstr=*/false); // TODO: remove
     ++					   // is_linux_strings_cstr
     ++					   // as it is obsolete
      +
      +      // We do not take suppressed symbols into our symbol vector to avoid
      +      // accidental leakage. But we ensure supressed symbols are otherwise set
     @@ src/abg-symtab-reader.cc: namespace abigail
      +	}
      +      else if (symbol_sptr->is_defined())
      +	{
     -+	  const GElf_Addr symbol_value =
     ++	  GElf_Addr symbol_value =
      +	      elf_helpers::maybe_adjust_et_rel_sym_addr_to_abs_addr(elf_handle,
      +								    sym);
      +
     ++	  if (symbol_sptr->is_function() && is_arm32)
     ++	    // Clear bit zero of ARM32 addresses as per "ELF for the Arm
     ++	    // Architecture" section 5.5.3.
     ++	    // https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
     ++	    symbol_value &= ~1;
     ++
      +	  const auto result =
      +	    addr_symbol_map_.emplace(symbol_value, symbol_sptr);
      +	  if (!result.second)
     @@ src/abg-symtab-reader.cc: namespace abigail
      +/// This method assumes the lookup maps are correct and sets up the data
      +/// vector as well as the name->symbol lookup map. The addr->symbol lookup
      +/// map cannot be set up in this case.
     ++///
     ++/// @param function_symbol_map a map from ELF function name to elf_symbol
     ++///
     ++/// @param variable_symbol_map a map from ELF variable name to elf_symbol
     ++///
     ++/// @return true if the load succeeded
      +bool
      +symtab::load_(string_elf_symbols_map_sptr function_symbol_map,
      +	     string_elf_symbols_map_sptr variables_symbol_map)
     @@ src/abg-symtab-reader.h
      +  bool
      +  matches(const elf_symbol& symbol) const;
      +
     ++  /// Enable or disable function filtering
     ++  ///
     ++  /// @param new_value whether to filter for functions
      +  void
      +  set_functions(bool new_value = true)
     -+  { functions_ = new_value; };
     ++  {functions_ = new_value;};
      +
     ++  /// Enable or disable variable filtering
     ++  ///
     ++  /// @param new_value whether to filter for variables
      +  void
      +  set_variables(bool new_value = true)
     -+  { variables_ = new_value; };
     ++  {variables_ = new_value;};
      +
     ++  /// Enable or disable public symbol filtering
     ++  ///
     ++  /// @param new_value whether to filter for public symbols
      +  void
      +  set_public_symbols(bool new_value = true)
     -+  { public_symbols_ = new_value; };
     ++  {public_symbols_ = new_value;};
      +
     ++  /// Enable or disable undefined symbol filtering
     ++  ///
     ++  /// @param new_value whether to filter for undefined symbols
      +  void
      +  set_undefined_symbols(bool new_value = true)
     -+  { undefined_symbols_ = new_value; };
     ++  {undefined_symbols_ = new_value;};
      +
     ++  /// Enable or disable kernel symbol filtering
     ++  ///
     ++  /// @param new_value whether to filter for kernel symbols
      +  void
      +  set_kernel_symbols(bool new_value = true)
     -+  { kernel_symbols_ = new_value; };
     ++  {kernel_symbols_ = new_value;};
      +
      +private:
      +  // The symbol is a function (FUNC)
     @@ src/abg-symtab-reader.h
      +  /// Construct the iterator based on a pair of underlying iterators and a
      +  /// symtab_filter object. Immediately fast forward to the next element that
      +  /// matches the criteria (if any).
     ++  ///
     ++  /// @param begin the underlying begin iterator
     ++  ///
     ++  /// @param begin the underlying end iterator
     ++  ///
     ++  /// @param filter the symtab_filter to apply
      +  symtab_iterator(base_iterator	       begin,
      +		  base_iterator	       end,
      +		  const symtab_filter& filter = symtab_filter())
      +    : base_iterator(begin), end_(end), filter_(filter)
     -+  { skip_to_next(); }
     ++  {skip_to_next();}
      +
      +  /// Pre-increment operator to advance to the next matching element.
     ++  ///
     ++  /// @return itself after incrementing
      +  symtab_iterator&
      +  operator++()
      +  {
     @@ src/abg-symtab-reader.h
      +  }
      +
      +  /// Post-increment operator to advance to the next matching element.
     ++  ///
     ++  /// @return a copy of the iterator before incrementing
      +  symtab_iterator
      +  operator++(int)
      +  {
     @@ src/abg-symtab-reader.h
      +  /// @return true if there are symbols detected earlier.
      +  bool
      +  has_symbols() const
     -+  { return is_kernel_binary_ ? has_ksymtab_entries_ : !symbols_.empty(); }
     ++  {return is_kernel_binary_ ? has_ksymtab_entries_ : !symbols_.empty();}
      +
      +  symtab_filter
      +  make_filter() const;
     @@ src/abg-symtab-reader.h
      +  /// @return a filtering const_iterator of the underlying type
      +  const_iterator
      +  begin(const symtab_filter& filter) const
     -+  { return symtab_iterator(symbols_.begin(), symbols_.end(), filter); }
     ++  {return symtab_iterator(symbols_.begin(), symbols_.end(), filter);}
      +
      +  /// Obtain an iterator to the end of the symtab.
      +  ///
      +  /// @return an end iterator
      +  const_iterator
      +  end() const
     -+  { return symtab_iterator(symbols_.end(), symbols_.end()); }
     ++  {return symtab_iterator(symbols_.end(), symbols_.end());}
      +
      +  const elf_symbols&
      +  lookup_symbol(const std::string& name) const;
     @@ src/abg-symtab-reader.h
      +  /// Construct the proxy object keeping references to the underlying symtab
      +  /// and the filter object.
      +  filtered_symtab(const symtab& tab, const symtab_filter& filter)
     -+    : tab_(tab), filter_(filter) { }
     ++    : tab_(tab), filter_(filter)
     ++  {}
      +
      +  /// Pass through symtab.begin(), but also pass on the filter.
      +  symtab::const_iterator
      +  begin() const
     -+  { return tab_.begin(filter_); }
     ++  {return tab_.begin(filter_);}
      +
      +  /// Pass through symtab.end().
      +  symtab::const_iterator
      +  end() const
     -+  { return tab_.end(); }
     ++  {return tab_.end();}
      +};
      +
       } // end namespace symtab_reader
  2:  39bcfbea4481 !  3:  55ed5b05594f Integrate new symtab reader into corpus and read_context
     @@ Commit message
                  * tests/test-symtab.cc: Add test assertions.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## include/abg-corpus.h ##
     @@ include/abg-fwd.h: typedef vector<suppression_sptr> suppressions_type;
      +{
      +
      +class symtab;
     ++/// Convenience typedef for a shared pointer to a @ref symtab
      +typedef std::shared_ptr<symtab> symtab_sptr;
      +
      +} // end namespace symtab_reader
     @@ src/abg-corpus.cc: corpus::operator==(const corpus& other) const
       	  && j == other.get_translation_units().end());
       }
       
     ++/// Setter for the symtab object.
     ++///
     ++/// @param symtab a shared pointer to the new symtab object
      +void
      +corpus::set_symtab(symtab_reader::symtab_sptr symtab)
      +{priv_->symtab_ = symtab;}
      +
     ++/// Getter for the symtab object.
     ++///
     ++/// @return a shared pointer to the symtab object
      +const symtab_reader::symtab_sptr&
      +corpus::get_symtab() const
     -+{ return priv_->symtab_; }
     ++{return priv_->symtab_;}
      +
       /// Setter of the function symbols map.
       ///
     @@ src/abg-dwarf-reader.cc: public:
           return symbol;
         }
       
     ++  /// Getter for the symtab reader. Will load the symtab from the elf handle if
     ++  /// not yet set.
     ++  ///
     ++  /// @return a shared pointer to the symtab object
      +  const symtab_reader::symtab_sptr&
      +  symtab() const
      +  {
      +    if (!symtab_)
     -+      symtab_ = symtab_reader::symtab::load(
     -+	elf_handle(), options_.env, [&](const elf_symbol_sptr& symbol) {
     -+	  return is_elf_symbol_suppressed(symbol);
     -+	});
     ++      symtab_ = symtab_reader::symtab::load
     ++	(elf_handle(), options_.env,
     ++	 [&](const elf_symbol_sptr& symbol)
     ++	 {return is_elf_symbol_suppressed(symbol);});
      +
      +    if (!symtab_)
      +      std::cerr << "Symbol table of '" << elf_path_
     @@ src/abg-reader.cc: ABG_BEGIN_EXPORT_DECLARATIONS
       #include "abg-corpus.h"
      +#include "abg-symtab-reader.h"
       
     - #ifdef WITH_ZIP_ARCHIVE
     - #include "abg-libzip-utils.h"
     + ABG_END_EXPORT_DECLARATIONS
     + // </headers defining libabigail's API>
      @@ src/abg-reader.cc: read_corpus_from_input(read_context& ctxt)
             // Note that it's possible that both fn_sym_db and var_sym_db
             // are nil, due to potential suppression specifications.  That's
     @@ tests/test-symtab.cc: TEST_CASE("Symtab::Empty", "[symtab, basic]")
       }
       
       TEST_CASE("Symtab::NoDebugInfo", "[symtab, basic]")
     -@@ tests/test-symtab.cc: TEST_CASE("Symtab::NoDebugInfo", "[symtab, basic]")
     -   const dwarf_reader::status status = read_corpus(binary, corpus_ptr);
     -   REQUIRE(corpus_ptr);
     - 
     --  REQUIRE(status
     --	  == (dwarf_reader::STATUS_OK
     --	      | dwarf_reader::STATUS_DEBUG_INFO_NOT_FOUND));
     -+  REQUIRE(
     -+    status
     -+    == (dwarf_reader::STATUS_OK | dwarf_reader::STATUS_DEBUG_INFO_NOT_FOUND));
     - }
     - 
     - // this value indicates in the following helper method, that we do not want to
  3:  5ef5579b2e02 !  4:  e32f1b981ec5 corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab
     @@ Commit message
                    data.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-corpus-priv.h ##
     @@ src/abg-corpus.cc: const string_elf_symbols_map_type&
      -  {return operator()(*l, *r);}
      -}; // end struct elf_symbol_comp_functor
      -
     --/// Return a sorted vector of function symbols for this corpus.
     --///
     --/// Note that the first time this function is called, the symbols are
     --/// sorted and cached.  Subsequent invocations of this function return
     --/// the cached vector that was built previously.
     --///
     --/// @return the sorted list of function symbols.
     + /// Return a sorted vector of function symbols for this corpus.
     + ///
     + /// Note that the first time this function is called, the symbols are
     +@@ src/abg-corpus.cc: struct elf_symbol_comp_functor
     + /// @return the sorted list of function symbols.
       const elf_symbols&
       corpus::get_sorted_fun_symbols() const
      -{
     @@ src/abg-corpus.cc: const string_elf_symbols_map_type&
      -	     s != i->second.end();
      -	     ++s)
      -	  priv_->sorted_fun_symbols.push_back(*s);
     -+{ return priv_->get_sorted_fun_symbols(); }
     - 
     +-
      -      elf_symbol_comp_functor comp;
      -      std::sort(priv_->sorted_fun_symbols.begin(),
      -		priv_->sorted_fun_symbols.end(),
     @@ src/abg-corpus.cc: const string_elf_symbols_map_type&
      -    }
      -  return priv_->sorted_fun_symbols;
      -}
     --
     --/// Getter for a sorted vector of the function symbols undefined in
     --/// this corpus.
     --///
     --/// @return a vector of the function symbols undefined in this corpus,
     --/// sorted by name and then version.
     ++{return priv_->get_sorted_fun_symbols();}
     + 
     + /// Getter for a sorted vector of the function symbols undefined in
     + /// this corpus.
     +@@ src/abg-corpus.cc: corpus::get_sorted_fun_symbols() const
     + /// sorted by name and then version.
       const elf_symbols&
       corpus::get_sorted_undefined_fun_symbols() const
      -{
     @@ src/abg-corpus.cc: const string_elf_symbols_map_type&
      -	     s != i->second.end();
      -	     ++s)
      -	  priv_->sorted_undefined_fun_symbols.push_back(*s);
     -+{ return priv_->get_sorted_undefined_fun_symbols(); }
     ++{return priv_->get_sorted_undefined_fun_symbols();}
       
      -      elf_symbol_comp_functor comp;
      -      std::sort(priv_->sorted_undefined_fun_symbols.begin(),
     @@ src/abg-corpus.cc: const string_elf_symbols_map_type&
      -    }
      -  return priv_->sorted_undefined_fun_symbols;
      -}
     ++/// Getter for the sorted vector of variable symbols for this corpus.
     ++///
     ++/// Note that the first time this function is called, it computes the
     ++/// sorted vector, caches the result and returns it.  Subsequent
     ++/// invocations of this function just return the cached vector.
     ++///
     ++/// @return the sorted vector of variable symbols for this corpus.
      +const elf_symbols&
      +corpus::get_sorted_var_symbols() const
     -+{ return priv_->get_sorted_var_symbols(); }
     ++{return priv_->get_sorted_var_symbols();}
      +
     ++/// Getter for a sorted vector of the variable symbols undefined in
     ++/// this corpus.
     ++///
     ++/// @return a vector of the variable symbols undefined in this corpus,
     ++/// sorted by name and then version.
      +const elf_symbols&
      +corpus::get_sorted_undefined_var_symbols() const
     -+{ return priv_->get_sorted_undefined_var_symbols(); }
     ++{return priv_->get_sorted_undefined_var_symbols();}
       
       /// Getter for the variable symbols map.
       ///
     @@ tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
         <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'/>
  4:  8e0b8cc05905 !  5:  dfdc0dac7a41 corpus: make get_unreferenced_(function|variable)_symbols use the new symtab
     @@ Commit message
                    (corpus::get_unreferenced_variable_symbols): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-corpus-priv.h ##
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_undefined_fun_symbols() const
      +/// unreferenced function symbol is not in the list of functions to keep, then
      +/// that symbol is dropped and will not be part of the resulting table of
      +/// unreferenced symbol that is built.
     ++///
     ++/// @return list of symbols that are not referenced by any function
      +const elf_symbols&
      +corpus::priv::get_unreferenced_function_symbols() const
      +{
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_undefined_var_symbols() const
      +/// unreferenced variable symbol is not in the list of variable to keep, then
      +/// that symbol is dropped and will not be part of the resulting table of
      +/// unreferenced symbol that is built.
     ++///
     ++/// @return list of symbols that are not referenced by any variable
      +const elf_symbols&
      +corpus::priv::get_unreferenced_variable_symbols() const
      +{
     @@ src/abg-corpus.cc: corpus::sort_variables()
      -    priv_->build_unreferenced_symbols_tables();
      -  return priv_->unrefed_fun_symbols;
      -}
     -+{ return priv_->get_unreferenced_function_symbols(); }
     ++{return priv_->get_unreferenced_function_symbols();}
       
       /// Getter of the set of variable symbols that are not referenced by
       /// any variable exported by the current corpus.
     @@ src/abg-corpus.cc: corpus::get_unreferenced_function_symbols() const
      -    priv_->build_unreferenced_symbols_tables();
      -  return priv_->unrefed_var_symbols;
      -}
     -+{ return priv_->get_unreferenced_variable_symbols(); }
     ++{return priv_->get_unreferenced_variable_symbols();}
       
       /// Accessor for the regex patterns describing the functions to drop
       /// from the public decl table.
  5:  27ea88e05723 !  6:  7cd416fa89a6 abg-reader: avoid using the (var|function)_symbol_map
     @@ Commit message
                    (build_var_decl): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-reader.cc ##
  6:  3fa9dd5b1896 !  7:  d4008d912907 dwarf-reader: read_context: use new symtab in *_symbols_is_exported
     @@ Commit message
                    (variable_symbol_is_exported): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-dwarf-reader.cc ##
  7:  1c77268752a8 !  8:  2411eea56423 Switch kernel stuff over to new symtab and drop unused code
     @@ Commit message
                  (read_context::var_addr_sym_map): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-dwarf-reader.cc ##
  8:  4c25fd44ae50 !  9:  6bb34d0ef69f abg-elf-helpers: migrate ppc64 specific helpers
     @@ Commit message
                  (address_is_in_opd_section): New declaration.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-dwarf-reader.cc ##
     @@ src/abg-dwarf-reader.cc: public:
       		      GElf_Addr fn_desc_addr = sym->st_value;
       		      GElf_Addr fn_entry_point_addr =
      -			lookup_ppc64_elf_fn_entry_point_address(fn_desc_addr);
     -+			  lookup_ppc64_elf_fn_entry_point_address(
     -+			      elf_handle(), fn_desc_addr);
     ++			lookup_ppc64_elf_fn_entry_point_address(elf_handle(),
     ++								fn_desc_addr);
       		      addr_elf_symbol_sptr_map_type::const_iterator it2 =
       			fun_entry_addr_sym_map().find(fn_entry_point_addr);
       
     @@ src/abg-elf-helpers.h
       #include <gelf.h>
       #include <string>
       
     -@@ src/abg-elf-helpers.h: architecture_is_ppc64(Elf* elf_handle);
     +@@ src/abg-elf-helpers.h: architecture_is_arm32(Elf* elf_handle);
       bool
       architecture_is_big_endian(Elf* elf_handle);
       
  9:  5976180a2a32 ! 10:  6e29c69af793 symtab_reader: add support for ppc64 ELFv1 binaries
     @@ Commit message
                    function declaration.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-symtab-reader.cc ##
     @@ src/abg-symtab-reader.cc: const elf_symbol_sptr&
      +    return addr_it->second;
      +  else
      +    {
     ++      // check for a potential entry address mapping instead,
     ++      // relevant for ppc ELFv1 binaries
      +      const auto entry_it = entry_addr_symbol_map_.find(symbol_addr);
      +      if (entry_it != entry_addr_symbol_map_.end())
      +	return entry_it->second;
     @@ src/abg-symtab-reader.cc: const elf_symbol_sptr&
       }
       
      @@ src/abg-symtab-reader.cc: symtab::load_(Elf*	       elf_handle,
     -   const bool is_kernel = elf_helpers::is_linux_kernel(elf_handle);
         std::unordered_set<std::string> exported_kernel_symbols;
       
     +   const bool is_arm32 = elf_helpers::architecture_is_arm32(elf_handle);
      +  const bool is_ppc64 = elf_helpers::architecture_is_ppc64(elf_handle);
     -+
     + 
         for (size_t i = 0; i < number_syms; ++i)
           {
     -       GElf_Sym *sym, sym_mem;
      @@ src/abg-symtab-reader.cc: symtab::load_(Elf*	       elf_handle,
       	      elf_helpers::maybe_adjust_et_rel_sym_addr_to_abs_addr(elf_handle,
       								    sym);
       
     -+	  if (is_ppc64 && symbol_sptr->is_function())
     -+	    update_function_entry_address_symbol_map(elf_handle, sym,
     -+						     symbol_sptr);
     -+
     +-	  if (symbol_sptr->is_function() && is_arm32)
     +-	    // Clear bit zero of ARM32 addresses as per "ELF for the Arm
     +-	    // Architecture" section 5.5.3.
     +-	    // https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
     +-	    symbol_value &= ~1;
     ++	  if (symbol_sptr->is_function())
     ++	    {
     ++	      if (is_arm32)
     ++		// Clear bit zero of ARM32 addresses as per "ELF for the Arm
     ++		// Architecture" section 5.5.3.
     ++		// https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
     ++		symbol_value &= ~1;
     ++	      else if (is_ppc64)
     ++		update_function_entry_address_symbol_map(elf_handle, sym,
     ++							 symbol_sptr);
     ++	    }
     + 
       	  const auto result =
       	    addr_symbol_map_.emplace(symbol_value, symbol_sptr);
     - 	  if (!result.second)
      @@ src/abg-symtab-reader.cc: symtab::load_(string_elf_symbols_map_sptr function_symbol_map,
         return true;
       }
       
     ++/// Update the function entry symbol map to later allow lookups of this symbol
     ++/// by entry address as well. This is relevant for ppc64 ELFv1 binaries.
     ++///
     ++/// For ppc64 ELFv1 binaries, we need to build a function entry point address
     ++/// -> function symbol map. This is in addition to the function pointer ->
     ++/// symbol map.  This is because on ppc64 ELFv1, a function pointer is
     ++/// different from a function entry point address.
     ++///
     ++/// On ppc64 ELFv1, the DWARF DIE of a function references the address of the
     ++/// entry point of the function symbol; whereas the value of the function
     ++/// symbol is the function pointer. As these addresses are different, if I we
     ++/// want to get to the symbol of a function from its entry point address (as
     ++/// referenced by DWARF function DIEs) we must have the two maps I mentionned
     ++/// right above.
     ++///
     ++/// In other words, we need a map that associates a function entry point
     ++/// address with the symbol of that function, to be able to get the function
     ++/// symbol that corresponds to a given function DIE, on ppc64.
     ++///
     ++/// The value of the function pointer (the value of the symbol) usually refers
     ++/// to the offset of a table in the .opd section.  But sometimes, for a symbol
     ++/// named "foo", the corresponding symbol named ".foo" (note the dot before
     ++/// foo) which value is the entry point address of the function; that entry
     ++/// point address refers to a region in the .text section.
     ++///
     ++/// So we are only interested in values of the symbol that are in the .opd
     ++/// section.
     ++///
     ++/// @param elf_handle the ELF handle to operate on
     ++///
     ++/// @param native_symbol the native Elf symbol to update the entry for
     ++///
     ++/// @param symbol_sptr the internal symbol to associte the entry address with
      +void
      +symtab::update_function_entry_address_symbol_map(
     -+    Elf*		   elf_handle,
     -+    GElf_Sym*		   native_symbol,
     -+    const elf_symbol_sptr& symbol_sptr)
     ++  Elf* elf_handle, GElf_Sym* native_symbol, const elf_symbol_sptr& symbol_sptr)
      +{
     -+
     -+  // For ppc64 ELFv1 binaries, we need to build a function entry point address
     -+  // -> function symbol map. This is in addition to the function pointer ->
     -+  // symbol map.  This is because on ppc64 ELFv1, a function pointer is
     -+  // different from a function entry point address.
     -+  //
     -+  // On ppc64 ELFv1, the DWARF DIE of a function references the address of the
     -+  // entry point of the function symbol; whereas the value of the function
     -+  // symbol is the function pointer. As these addresses are different, if I we
     -+  // want to get to the symbol of a function from its entry point address (as
     -+  // referenced by DWARF function DIEs) we must have the two maps I mentionned
     -+  // right above.
     -+  //
     -+  // In other words, we need a map that associates a function entry point
     -+  // address with the symbol of that function, to be able to get the function
     -+  // symbol that corresponds to a given function DIE, on ppc64.
     -+  //
     -+  // The value of the function pointer (the value of the symbol) usually refers
     -+  // to the offset of a table in the .opd section.  But sometimes, for a symbol
     -+  // named "foo", the corresponding symbol named ".foo" (note the dot before
     -+  // foo) which value is the entry point address of the function; that entry
     -+  // point address refers to a region in the .text section.
     -+  //
     -+  // So we are only interested in values of the symbol that are in the .opd
     -+  // section.
      +  const GElf_Addr fn_desc_addr = native_symbol->st_value;
      +  const GElf_Addr fn_entry_point_addr =
      +    elf_helpers::lookup_ppc64_elf_fn_entry_point_address(elf_handle,
10:  fccb335d3763 ! 11:  ef5a022875f0 abg-corpus: remove symbol maps and their setters
     @@ Commit message
                  expected test output.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## include/abg-corpus.h ##
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_fun_symbols() const
         return *sorted_fun_symbols;
       }
       
     ++/// Return a map from name to function symbol for this corpus.
     ++///
     ++/// Note that the first time this function is called, the map is built.
     ++/// Subsequent invocations of this function return the cached map that was
     ++/// built previously.
     ++///
     ++/// @return the name function symbol map
      +const string_elf_symbols_map_type&
      +corpus::priv::get_fun_symbol_map() const
      +{
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_undefined_fun_symbols() const
         return *sorted_undefined_fun_symbols;
       }
       
     ++/// Return a map from name to undefined function symbol for this corpus.
     ++///
     ++/// Note that the first time this function is called, the map is built.
     ++/// Subsequent invocations of this function return the cached map that was
     ++/// built previously.
     ++///
     ++/// @return the name function symbol map for undefined symbols
      +const string_elf_symbols_map_type&
      +corpus::priv::get_undefined_fun_symbol_map() const
      +{
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_var_symbols() const
         return *sorted_var_symbols;
       }
       
     ++/// Return a map from name to variable symbol for this corpus.
     ++///
     ++/// Note that the first time this function is called, the map is built.
     ++/// Subsequent invocations of this function return the cached map that was
     ++/// built previously.
     ++///
     ++/// @return the name variable symbol map
      +const string_elf_symbols_map_type&
      +corpus::priv::get_var_symbol_map() const
      +{
     @@ src/abg-corpus.cc: corpus::priv::get_sorted_undefined_var_symbols() const
         return *sorted_undefined_var_symbols;
       }
       
     ++/// Return a map from name to undefined variable symbol for this corpus.
     ++///
     ++/// Note that the first time this function is called, the map is built.
     ++/// Subsequent invocations of this function return the cached map that was
     ++/// built previously.
     ++///
     ++/// @return the name undefined variable symbol map
      +const string_elf_symbols_map_type&
      +corpus::priv::get_undefined_var_symbol_map() const
      +{
     @@ src/abg-corpus.cc: corpus::is_empty() const
       }
      @@ src/abg-corpus.cc: const symtab_reader::symtab_sptr&
       corpus::get_symtab() const
     - { return priv_->symtab_; }
     + {return priv_->symtab_;}
       
      -/// Setter of the function symbols map.
      -///
     @@ src/abg-corpus.cc: corpus::get_undefined_fun_symbol_map_sptr() const
      -{return *get_undefined_fun_symbol_map_sptr();}
      +{return priv_->get_undefined_fun_symbol_map();}
       
     - const elf_symbols&
     - corpus::get_sorted_fun_symbols() const
     + /// Return a sorted vector of function symbols for this corpus.
     + ///
      @@ src/abg-corpus.cc: const elf_symbols&
       corpus::get_sorted_undefined_var_symbols() const
     - { return priv_->get_sorted_undefined_var_symbols(); }
     + {return priv_->get_sorted_undefined_var_symbols();}
       
      -/// Getter for the variable symbols map.
      -///
     @@ tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
         </elf-function-symbols>
      -  <elf-variable-symbols>
      -  </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'>
      
11:  b3567a749c22 ! 12:  f8c3cd1438d7 dwarf reader: drop (now) unused code related to symbol table reading
     @@ Commit message
                  * tools/abidw.cc (main): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## include/abg-dwarf-reader.h ##
     @@ src/abg-dwarf-reader.cc: public:
      -    ABG_ASSERT(gelf_getehdr(elf_handle(), &elf_header));
      -
      -    bool is_ppc64 = architecture_is_ppc64(elf_handle());
     +-    bool is_arm32 = architecture_is_arm32(elf_handle());
      -
      -    for (size_t i = 0; i < nb_syms; ++i)
      -      {
     @@ src/abg-dwarf-reader.cc: public:
      -		      maybe_adjust_et_rel_sym_addr_to_abs_addr(elf_handle(),
      -							       sym);
      -
     +-		  if (is_arm32)
     +-		    // Clear bit zero of ARM32 addresses as per "ELF for the Arm
     +-		    // Architecture" section 5.5.3.
     +-		    // https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
     +-		    symbol_value &= ~1;
      -		  addr_elf_symbol_sptr_map_type::const_iterator it =
      -		    fun_addr_sym_map_->find(symbol_value);
      -		  if (it == fun_addr_sym_map_->end())
     @@ src/abg-dwarf-reader.cc: public:
      -		      // symbol that are in the .opd section.
      -		      GElf_Addr fn_desc_addr = sym->st_value;
      -		      GElf_Addr fn_entry_point_addr =
     --			  lookup_ppc64_elf_fn_entry_point_address(
     --			      elf_handle(), fn_desc_addr);
     +-			lookup_ppc64_elf_fn_entry_point_address(elf_handle(),
     +-								fn_desc_addr);
      -		      addr_elf_symbol_sptr_map_type::const_iterator it2 =
      -			fun_entry_addr_sym_map().find(fn_entry_point_addr);
      -
     @@ src/abg-dwarf-reader.cc: build_var_decl(read_context&	ctxt,
      -	}
      +      Dwarf_Addr      var_addr;
      +      if (ctxt.get_variable_address(die, var_addr))
     -+	var_sym = var_sym = ctxt.variable_symbol_is_exported(var_addr);
     ++	var_sym = ctxt.variable_symbol_is_exported(var_addr);
       
             if (var_sym)
       	{
12:  9ab4ff413b6d ! 13:  9231995c5fc5 test-symtab: add tests for whitelisted functions
     @@ Commit message
                  (Symtab::SymtabWithWhitelist): New testcase.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## tests/data/Makefile.am ##
     @@ tests/test-symtab.cc: using dwarf_reader::read_context_sptr;
       
       dwarf_reader::status
      -read_corpus(const std::string path, corpus_sptr& result)
     -+read_corpus(
     -+  const std::string&		  path,
     -+  corpus_sptr&			  result,
     -+  const std::vector<std::string>& whitelist_paths = std::vector<std::string>())
     ++read_corpus(const std::string&		    path,
     ++	    corpus_sptr&		    result,
     ++	    const std::vector<std::string>& whitelist_paths =
     ++		std::vector<std::string>())
       {
         const std::string& absolute_path = test_data_dir + path;
       
     -@@ tests/test-symtab.cc: read_corpus(const std::string path, corpus_sptr& result)
     -       absolute_path, debug_info_root_paths, env.get(),
     -       /* load_all_type = */ true, /* linux_kernel_mode = */ true);
     - 
     +   environment_sptr	    env(new environment);
     +   const std::vector<char**> debug_info_root_paths;
     +-  read_context_sptr	    ctxt = create_read_context(
     +-      absolute_path, debug_info_root_paths, env.get(),
     +-      /* load_all_type = */ true, /* linux_kernel_mode = */ true);
     ++  read_context_sptr	    ctxt =
     ++      create_read_context(absolute_path, debug_info_root_paths, env.get(),
     ++			  /* load_all_type = */ true,
     ++			  /* linux_kernel_mode = */ true);
     ++
      +  if (!whitelist_paths.empty())
      +    {
      +      const suppressions_type& wl_suppr =
     @@ tests/test-symtab.cc: read_corpus(const std::string path, corpus_sptr& result)
      +      REQUIRE_FALSE(wl_suppr.empty());
      +      dwarf_reader::add_read_context_suppressions(*ctxt, wl_suppr);
      +    }
     -+
     + 
         dwarf_reader::status status = dwarf_reader::STATUS_UNKNOWN;
         result = read_corpus_from_elf(*ctxt, status);
     - 
     -@@ tests/test-symtab.cc: TEST_CASE("Symtab::NoDebugInfo", "[symtab, basic]")
     - #define N std::numeric_limits<size_t>::max()
     - 
     - corpus_sptr
     --assert_symbol_count(const std::string& path,
     --		    size_t	       function_symbols = 0,
     --		    size_t	       variable_symbols = 0,
     --		    size_t	       undefined_function_symbols = 0,
     +@@ tests/test-symtab.cc: assert_symbol_count(const std::string& path,
     + 		    size_t	       function_symbols = 0,
     + 		    size_t	       variable_symbols = 0,
     + 		    size_t	       undefined_function_symbols = 0,
      -		    size_t	       undefined_variable_symbols = 0)
     -+assert_symbol_count(
     -+  const std::string&		  path,
     -+  size_t			  function_symbols = 0,
     -+  size_t			  variable_symbols = 0,
     -+  size_t			  undefined_function_symbols = 0,
     -+  size_t			  undefined_variable_symbols = 0,
     -+  const std::vector<std::string>& whitelist_paths = std::vector<std::string>())
     ++		    size_t	       undefined_variable_symbols = 0,
     ++		    const std::vector<std::string>& whitelist_paths =
     ++			std::vector<std::string>())
       {
         corpus_sptr		     corpus_ptr;
      -  const dwarf_reader::status status = read_corpus(path, corpus_ptr);
13:  a7536e784c80 ! 14:  200f7f10e6bf symtab/dwarf-reader: allow hinting of main symbols for aliases
     @@ Commit message
                  (Symtab::AliasedVariableSymbols): Likewise.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## include/abg-ir.h ##
     @@ src/abg-dwarf-reader.cc: build_var_decl(read_context&	ctxt,
             elf_symbol_sptr var_sym;
             Dwarf_Addr      var_addr;
             if (ctxt.get_variable_address(die, var_addr))
     --	var_sym = var_sym = ctxt.variable_symbol_is_exported(var_addr);
     +-	var_sym = ctxt.variable_symbol_is_exported(var_addr);
      +	{
      +	  ctxt.symtab()->update_main_symbol(var_addr,
      +					    result->get_linkage_name().empty()
     @@ src/abg-symtab-reader.cc: symtab::load_(string_elf_symbols_map_sptr function_sym
      +    addr_symbol_map_[addr] = new_main;
      +}
      +
     - void
     - symtab::update_function_entry_address_symbol_map(
     -     Elf*		   elf_handle,
     + /// Update the function entry symbol map to later allow lookups of this symbol
     + /// by entry address as well. This is relevant for ppc64 ELFv1 binaries.
     + ///
      
       ## src/abg-symtab-reader.h ##
      @@ src/abg-symtab-reader.h: public:
     @@ tests/data/Makefile.am: test-kmi-whitelist/whitelist-with-duplicate-entry \
       ## tests/data/test-abicompat/test5-fn-changed-report-0.txt ##
      @@ tests/data/test-abicompat/test5-fn-changed-report-0.txt: have sub-types that are different from what application 'test5-fn-changed-app' e
               1 data member deletion:
     -           'unsigned char S1::m1', at offset 32 (in bits)
     +           'unsigned char m1', at offset 32 (in bits)
       
      -  method S0::S0():
      -    implicit parameter 0 of type 'S0*' has sub-type changes:
     @@ tests/data/test-abicompat/test5-fn-changed-report-0.txt: have sub-types that are
       ## tests/data/test-abicompat/test5-fn-changed-report-1.txt ##
      @@ tests/data/test-abicompat/test5-fn-changed-report-1.txt: have sub-types that are different from what application 'test5-fn-changed-app' e
               1 data member deletion:
     -           'unsigned char S1::m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
     +           'unsigned char m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
       
      -  method S0::S0():
      -    implicit parameter 0 of type 'S0*' has sub-type changes:
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_munlock(void*, __sanitizer::uptr) -->
      -    <function-decl name='__interceptor_munlock' mangled-name='munlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='munlock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_mlockall(int) -->
      -    <function-decl name='__interceptor_mlockall' mangled-name='mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mlockall'>
      +    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- int -->
      @@
             <return type-id='type-id-1439'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1227' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
             <!-- parameter of type 'SIZE_T*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_drand48_r(void*, double*) -->
      -    <function-decl name='__interceptor_drand48_r' mangled-name='drand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drand48_r'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-587' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
             <!-- parameter of type 'double*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- char* __interceptor_tempnam(char*, char*) -->
      -    <function-decl name='__interceptor_tempnam' mangled-name='tempnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tempnam'>
      +    <function-decl name='__interceptor_tempnam' mangled-name='__interceptor_tempnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tempnam'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='dir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
     +       <parameter type-id='type-id-28' name='dir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_tmpnam_r(char*) -->
      -    <function-decl name='__interceptor_tmpnam_r' mangled-name='tmpnam_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tmpnam_r'>
      +    <function-decl name='__interceptor_tmpnam_r' mangled-name='__interceptor_tmpnam_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tmpnam_r'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
             <!-- char* -->
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_tmpnam(char*) -->
      -    <function-decl name='__interceptor_tmpnam' mangled-name='tmpnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tmpnam'>
      +    <function-decl name='__interceptor_tmpnam' mangled-name='__interceptor_tmpnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tmpnam'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
             <!-- char* -->
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getaffinity_np(void*, SIZE_T, void*) -->
      -    <function-decl name='__interceptor_pthread_attr_getaffinity_np' mangled-name='pthread_attr_getaffinity_np' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getaffinity_np'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1'/>
             <!-- parameter of type 'typedef SIZE_T' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getstack(void*, void**, SIZE_T*) -->
      -    <function-decl name='__interceptor_pthread_attr_getstack' mangled-name='pthread_attr_getstack' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getstack'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
             <!-- parameter of type 'void**' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getscope(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_attr_getscope' mangled-name='pthread_attr_getscope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getscope'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getschedpolicy(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_attr_getschedpolicy' mangled-name='pthread_attr_getschedpolicy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getschedpolicy'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getguardsize(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_attr_getguardsize' mangled-name='pthread_attr_getguardsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2576' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getguardsize'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_attr_getdetachstate(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_attr_getdetachstate' mangled-name='pthread_attr_getdetachstate' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getdetachstate'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- __sanitizer::__sanitizer_ether_addr* __interceptor_ether_aton_r(char*, __sanitizer::__sanitizer_ether_addr*) -->
      -    <function-decl name='__interceptor_ether_aton_r' mangled-name='ether_aton_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_aton_r'>
      +    <function-decl name='__interceptor_ether_aton_r' mangled-name='__interceptor_ether_aton_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_aton_r'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
      @@
             <return type-id='type-id-1169'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- int __interceptor_ether_line(char*, __sanitizer::__sanitizer_ether_addr*, char*) -->
      -    <function-decl name='__interceptor_ether_line' mangled-name='ether_line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_line'>
      +    <function-decl name='__interceptor_ether_line' mangled-name='__interceptor_ether_line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_line'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
     +       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_ether_hostton(char*, __sanitizer::__sanitizer_ether_addr*) -->
      -    <function-decl name='__interceptor_ether_hostton' mangled-name='ether_hostton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_hostton'>
      +    <function-decl name='__interceptor_ether_hostton' mangled-name='__interceptor_ether_hostton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_hostton'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     +       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_ether_ntohost(char*, __sanitizer::__sanitizer_ether_addr*) -->
      -    <function-decl name='__interceptor_ether_ntohost' mangled-name='ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_ntohost'>
      +    <function-decl name='__interceptor_ether_ntohost' mangled-name='__interceptor_ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntohost'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     +       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_ether_addr*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- int __interceptor_initgroups(char*, __sanitizer::u32) -->
      -    <function-decl name='__interceptor_initgroups' mangled-name='initgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='initgroups'>
      +    <function-decl name='__interceptor_initgroups' mangled-name='__interceptor_initgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_initgroups'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='user' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
     +       <parameter type-id='type-id-28' name='user' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
             <!-- parameter of type 'typedef __sanitizer::u32' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_fstatvfs64(int, void*) -->
      -    <function-decl name='__interceptor_fstatvfs64' mangled-name='fstatvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fstatvfs64'>
      +    <function-decl name='__interceptor_fstatvfs64' mangled-name='__interceptor_fstatvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstatvfs64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_statvfs64(char*, void*) -->
      -    <function-decl name='__interceptor_statvfs64' mangled-name='statvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='statvfs64'>
      +    <function-decl name='__interceptor_statvfs64' mangled-name='__interceptor_statvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_statvfs64'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_fstatfs64(int, void*) -->
      -    <function-decl name='__interceptor_fstatfs64' mangled-name='fstatfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fstatfs64'>
      +    <function-decl name='__interceptor_fstatfs64' mangled-name='__interceptor_fstatfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstatfs64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- __sanitizer::__sanitizer_mntent* __interceptor_getmntent_r(void*, __sanitizer::__sanitizer_mntent*, char*, int) -->
      -    <function-decl name='__interceptor_getmntent_r' mangled-name='getmntent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntent_r'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_mntent*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_cond_signal(void*) -->
      -    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_cond_signal'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_mutex_lock(void*) -->
      -    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_lock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- void __interceptor__exit(int) -->
      -    <function-decl name='__interceptor__exit' mangled-name='_exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_exit'>
      +    <function-decl name='__interceptor__exit' mangled-name='__interceptor__exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__exit'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- void -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sigpending(__sanitizer::__sanitizer_sigset_t*) -->
      -    <function-decl name='__interceptor_sigpending' mangled-name='sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigpending'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <!-- parameter of type '__sanitizer::__sanitizer_sigset_t*' -->
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sigfillset(__sanitizer::__sanitizer_sigset_t*) -->
      -    <function-decl name='__interceptor_sigfillset' mangled-name='sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigfillset'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sigwaitinfo(__sanitizer::__sanitizer_sigset_t*, void*) -->
      -    <function-decl name='__interceptor_sigwaitinfo' mangled-name='sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigwaitinfo'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_ppoll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, void*, __sanitizer::__sanitizer_sigset_t*) -->
      -    <function-decl name='__interceptor_ppoll' mangled-name='ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppoll'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1196' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
             <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_poll(__sanitizer::__sanitizer_pollfd*, __sanitizer::__sanitizer_nfds_t, int) -->
      -    <function-decl name='__interceptor_poll' mangled-name='poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='poll'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1196' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
             <!-- parameter of type 'typedef __sanitizer::__sanitizer_nfds_t' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___xpg_strerror_r(int, char*, SIZE_T) -->
      -    <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xpg_strerror_r'>
      +    <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__interceptor___xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xpg_strerror_r'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- char* __interceptor_strerror_r(int, char*, SIZE_T) -->
      -    <function-decl name='__interceptor_strerror_r' mangled-name='strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strerror_r'>
      +    <function-decl name='__interceptor_strerror_r' mangled-name='__interceptor_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strerror_r'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- int __interceptor_sched_getaffinity(int, SIZE_T, void*) -->
      -    <function-decl name='__interceptor_sched_getaffinity' mangled-name='sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_getaffinity'>
      +    <function-decl name='__interceptor_sched_getaffinity' mangled-name='__interceptor_sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sched_getaffinity'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
     +       <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
             <!-- parameter of type 'typedef SIZE_T' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- SIZE_T __interceptor_confstr(int, char*, SIZE_T) -->
      -    <function-decl name='__interceptor_confstr' mangled-name='confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='confstr'>
      +    <function-decl name='__interceptor_confstr' mangled-name='__interceptor_confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_confstr'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
     +       <parameter type-id='type-id-10' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
             <return type-id='type-id-617'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_wcsrtombs' mangled-name='wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wcsrtombs'>
      +    <function-decl name='__interceptor_wcsrtombs' mangled-name='__interceptor_wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsrtombs'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
     +       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
             <!-- parameter of type 'const wchar_t**' -->
      @@
             <return type-id='type-id-617'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_get_current_dir_name' mangled-name='get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_current_dir_name'>
      +    <function-decl name='__interceptor_get_current_dir_name' mangled-name='__interceptor_get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_get_current_dir_name'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
             <!-- char* -->
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_getcwd(char*, SIZE_T) -->
      -    <function-decl name='__interceptor_getcwd' mangled-name='getcwd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getcwd'>
      +    <function-decl name='__interceptor_getcwd' mangled-name='__interceptor_getcwd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getcwd'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1'/>
             <!-- parameter of type 'typedef SIZE_T' -->
      @@
             <return type-id='type-id-1164'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_getpeername(int, void*, unsigned int*) -->
      -    <function-decl name='__interceptor_getpeername' mangled-name='getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getpeername'>
      +    <function-decl name='__interceptor_getpeername' mangled-name='__interceptor_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getpeername'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
     +       <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-588' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
             <!-- parameter of type 'float*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_gethostbyname_r(char*, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
      -    <function-decl name='__interceptor_gethostbyname_r' mangled-name='gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname_r'>
      +    <function-decl name='__interceptor_gethostbyname_r' mangled-name='__interceptor_gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname_r'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
     +       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_hostent*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_gethostbyaddr_r(void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
      -    <function-decl name='__interceptor_gethostbyaddr_r' mangled-name='gethostbyaddr_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyaddr_r'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_gethostbyname' mangled-name='gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname'>
      +    <function-decl name='__interceptor_gethostbyname' mangled-name='__interceptor_gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
     +       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
             <!-- __sanitizer::__sanitizer_hostent* -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_inet_aton(const char*, void*) -->
      -    <function-decl name='__interceptor_inet_aton' mangled-name='inet_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inet_aton'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- int __interceptor_wait4(int, int*, int, void*) -->
      -    <function-decl name='__interceptor_wait4' mangled-name='wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait4'>
      +    <function-decl name='__interceptor_wait4' mangled-name='__interceptor_wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wait4'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
     +       <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
             <!-- parameter of type 'int*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_wait3(int*, int, void*) -->
      -    <function-decl name='__interceptor_wait3' mangled-name='wait3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait3'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_waitid(int, int, void*, int) -->
      -    <function-decl name='__interceptor_waitid' mangled-name='waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='waitid'>
      +    <function-decl name='__interceptor_waitid' mangled-name='__interceptor_waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitid'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
     +       <parameter type-id='type-id-10' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_getitimer(int, void*) -->
      -    <function-decl name='__interceptor_getitimer' mangled-name='getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getitimer'>
      +    <function-decl name='__interceptor_getitimer' mangled-name='__interceptor_getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getitimer'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_clock_settime(__sanitizer::u32, void*) -->
      -    <function-decl name='__interceptor_clock_settime' mangled-name='clock_settime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_settime'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-284' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_clock_gettime(__sanitizer::u32, void*) -->
      -    <function-decl name='__interceptor_clock_gettime' mangled-name='clock_gettime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_gettime'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-284' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_ioctl(int, unsigned int, void*) -->
      -    <function-decl name='__interceptor_ioctl' mangled-name='ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ioctl'>
      +    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
     +       <parameter type-id='type-id-10' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
             <!-- parameter of type 'unsigned int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_vfscanf(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
      -    <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vfscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_fscanf(void*, const char*, ...) -->
      -    <function-decl name='__interceptor___isoc99_fscanf' mangled-name='__isoc99_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_fscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_vsscanf(const char*, const char*, typedef __va_list_tag __va_list_tag*) -->
      -    <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vsscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_sscanf(const char*, const char*, ...) -->
      -    <function-decl name='__interceptor___isoc99_sscanf' mangled-name='__isoc99_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_sscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_vscanf(const char*, typedef __va_list_tag __va_list_tag*) -->
      -    <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
             <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___isoc99_scanf(const char*, ...) -->
      -    <function-decl name='__interceptor___isoc99_scanf' mangled-name='__isoc99_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_scanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
             <parameter is-variadic='yes'/>
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_vfscanf(void*, const char*, typedef __va_list_tag __va_list_tag*) -->
      -    <function-decl name='__interceptor_vfscanf' mangled-name='vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vfscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sscanf(const char*, const char*, ...) -->
      -    <function-decl name='__interceptor_sscanf' mangled-name='sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_vscanf(const char*, typedef __va_list_tag __va_list_tag*) -->
      -    <function-decl name='__interceptor_vscanf' mangled-name='vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
             <!-- parameter of type 'typedef __va_list_tag __va_list_tag*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_scanf(const char*, ...) -->
      -    <function-decl name='__interceptor_scanf' mangled-name='scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scanf'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
             <parameter is-variadic='yes'/>
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_asctime_r(__sanitizer::__sanitizer_tm*, char*) -->
      -    <function-decl name='__interceptor_asctime_r' mangled-name='asctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='asctime_r'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1199' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_ctime_r(unsigned long int*, char*) -->
      -    <function-decl name='__interceptor_ctime_r' mangled-name='ctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ctime_r'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-183' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_ctime(unsigned long int*) -->
      -    <function-decl name='__interceptor_ctime' mangled-name='ctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ctime'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_prctl' mangled-name='prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='prctl'>
      +    <function-decl name='__interceptor_prctl' mangled-name='__interceptor_prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_prctl'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
     +       <parameter type-id='type-id-10' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
             <!-- parameter of type 'unsigned long int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- SSIZE_T __interceptor_pwritev64(int, __sanitizer::__sanitizer_iovec*, int, OFF64_T) -->
      -    <function-decl name='__interceptor_pwritev64' mangled-name='pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev64'>
      +    <function-decl name='__interceptor_pwritev64' mangled-name='__interceptor_pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_pwritev' mangled-name='pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev'>
      +    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_pwrite64' mangled-name='pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite64'>
      +    <function-decl name='__interceptor_pwrite64' mangled-name='__interceptor_pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_pwrite' mangled-name='pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite'>
      +    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_write' mangled-name='write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='write'>
      +    <function-decl name='__interceptor_write' mangled-name='__interceptor_write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_write'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_preadv64' mangled-name='preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv64'>
      +    <function-decl name='__interceptor_preadv64' mangled-name='__interceptor_preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_preadv' mangled-name='preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv'>
      +    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_readv' mangled-name='readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='readv'>
      +    <function-decl name='__interceptor_readv' mangled-name='__interceptor_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readv'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
             <!-- parameter of type '__sanitizer::__sanitizer_iovec*' -->
      @@
             <return type-id='type-id-619'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_read' mangled-name='read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='read'>
      +    <function-decl name='__interceptor_read' mangled-name='__interceptor_read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_read'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-592'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- char* __interceptor_textdomain(const char*) -->
      -    <function-decl name='__interceptor_textdomain' mangled-name='textdomain' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='textdomain'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2'/>
             <!-- char* -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_gettimeofday(void*, void*) -->
      -    <function-decl name='__interceptor_gettimeofday' mangled-name='gettimeofday' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gettimeofday'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_kill(void*, int) -->
      -    <function-decl name='__interceptor_pthread_kill' mangled-name='pthread_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_kill'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sigaction(int, sigaction_t*, sigaction_t*) -->
      -    <function-decl name='__interceptor_sigaction' mangled-name='sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigaction'>
      +    <function-decl name='__interceptor_sigaction' mangled-name='__interceptor_sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigaction'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
     +       <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
             <!-- parameter of type 'sigaction_t*' -->
      @@
             <return type-id='type-id-635'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_epoll_wait' mangled-name='epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_wait'>
      +    <function-decl name='__interceptor_epoll_wait' mangled-name='__interceptor_epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_wait'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     +       <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_epoll_ctl(int, int, int, void*) -->
      -    <function-decl name='__interceptor_epoll_ctl' mangled-name='epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_ctl'>
      +    <function-decl name='__interceptor_epoll_ctl' mangled-name='__interceptor_epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_ctl'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     +       <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
             <!-- parameter of type 'int' -->
      @@
             <return type-id='type-id-1'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_rmdir' mangled-name='rmdir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rmdir'>
      +    <function-decl name='__interceptor_rmdir' mangled-name='__interceptor_rmdir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_rmdir'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- void __interceptor_abort(int) -->
      -    <function-decl name='__interceptor_abort' mangled-name='abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='abort'>
      +    <function-decl name='__interceptor_abort' mangled-name='__interceptor_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_abort'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- void -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- __sanitizer::uptr __interceptor_fwrite(void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
      -    <function-decl name='__interceptor_fwrite' mangled-name='fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fwrite'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_unlink' mangled-name='unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlink'>
      +    <function-decl name='__interceptor_unlink' mangled-name='__interceptor_unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_unlink'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- long_t __interceptor_recv(int, void*, long_t, int) -->
      -    <function-decl name='__interceptor_recv' mangled-name='recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='recv'>
      +    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
             <return type-id='type-id-638'/>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_send' mangled-name='send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='send'>
      +    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_close(int) -->
      -    <function-decl name='__interceptor_close' mangled-name='close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='close'>
      +    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_epoll_create1(int) -->
      -    <function-decl name='__interceptor_epoll_create1' mangled-name='epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_create1'>
      +    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_bind(int, void*, unsigned int) -->
      -    <function-decl name='__interceptor_bind' mangled-name='bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bind'>
      +    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_connect(int, void*, unsigned int) -->
      -    <function-decl name='__interceptor_connect' mangled-name='connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='connect'>
      +    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_inotify_init1(int) -->
      -    <function-decl name='__interceptor_inotify_init1' mangled-name='inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inotify_init1'>
      +    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_signalfd(int, void*, int) -->
      -    <function-decl name='__interceptor_signalfd' mangled-name='signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='signalfd'>
      +    <function-decl name='__interceptor_signalfd' mangled-name='__interceptor_signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_signalfd'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_eventfd(unsigned int, int) -->
      -    <function-decl name='__interceptor_eventfd' mangled-name='eventfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='eventfd'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-211' name='initval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_dup2(int, int) -->
      -    <function-decl name='__interceptor_dup2' mangled-name='dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup2'>
      +    <function-decl name='__interceptor_dup2' mangled-name='__interceptor_dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup2'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_dup(int) -->
      -    <function-decl name='__interceptor_dup' mangled-name='dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup'>
      +    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_open(const char*, int, int) -->
      -    <function-decl name='__interceptor_open' mangled-name='open' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='open'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_lstat64(const char*, void*) -->
      -    <function-decl name='__interceptor_lstat64' mangled-name='lstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lstat64'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___lxstat64(int, const char*, void*) -->
      -    <function-decl name='__interceptor___lxstat64' mangled-name='__lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat64'>
      +    <function-decl name='__interceptor___lxstat64' mangled-name='__interceptor___lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___lxstat64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___lxstat(int, const char*, void*) -->
      -    <function-decl name='__interceptor___lxstat' mangled-name='__lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat'>
      +    <function-decl name='__interceptor___lxstat' mangled-name='__interceptor___lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___lxstat'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor___xstat64(int, const char*, void*) -->
      -    <function-decl name='__interceptor___xstat64' mangled-name='__xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xstat64'>
      +    <function-decl name='__interceptor___xstat64' mangled-name='__interceptor___xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xstat64'>
             <!-- parameter of type 'int' -->
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <!-- parameter of type 'const char*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_stat(const char*, void*) -->
      -    <function-decl name='__interceptor_stat' mangled-name='stat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stat'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sem_timedwait(void*, void*) -->
      -    <function-decl name='__interceptor_sem_timedwait' mangled-name='sem_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_timedwait'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sem_destroy(void*) -->
      -    <function-decl name='__interceptor_sem_destroy' mangled-name='sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_destroy'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_sem_init(void*, int, unsigned int) -->
      -    <function-decl name='__interceptor_sem_init' mangled-name='sem_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_init'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_once(void*, void ()*) -->
      -    <function-decl name='__interceptor_pthread_once' mangled-name='pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_once'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='o' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
             <!-- parameter of type 'void ()*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_barrier_init(void*, void*, unsigned int) -->
      -    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_barrier_init'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='b' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_rwlock_trywrlock(void*) -->
      -    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_trywrlock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_rwlock_timedrdlock(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_rwlock_timedrdlock' mangled-name='pthread_rwlock_timedrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_timedrdlock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_rwlock_tryrdlock(void*) -->
      -    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_tryrdlock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_spin_lock(void*) -->
      -    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_lock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_spin_init(void*, int) -->
      -    <function-decl name='__interceptor_pthread_spin_init' mangled-name='pthread_spin_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_init'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_mutex_trylock(void*) -->
      -    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_trylock'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
             <!-- int -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- int __interceptor_pthread_mutex_init(void*, void*) -->
      -    <function-decl name='__interceptor_pthread_mutex_init' mangled-name='pthread_mutex_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_init'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_strncpy' mangled-name='strncpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncpy'>
      +    <function-decl name='__interceptor_strncpy' mangled-name='__interceptor_strncpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncpy'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='dst' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
     +       <parameter type-id='type-id-28' name='dst' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
             <!-- parameter of type 'char*' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- char* __interceptor_strrchr(char*, int) -->
      -    <function-decl name='__interceptor_strrchr' mangled-name='strrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strrchr'>
      +    <function-decl name='__interceptor_strrchr' mangled-name='__interceptor_strrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strrchr'>
             <!-- parameter of type 'char*' -->
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
             <!-- parameter of type 'int' -->
      @@
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
           <!-- void* __interceptor_memmove(void*, void*, __sanitizer::uptr) -->
      -    <function-decl name='__interceptor_memmove' mangled-name='memmove' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memmove'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- void* __interceptor_memcpy(void*, void*, __sanitizer::uptr) -->
      -    <function-decl name='__interceptor_memcpy' mangled-name='memcpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memcpy'>
     @@ tests/data/test-annotate/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <!-- parameter of type 'void*' -->
      @@
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
           <!-- unsigned int __interceptor_sleep(unsigned int) -->
      -    <function-decl name='__interceptor_sleep' mangled-name='sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sleep'>
     @@ tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt: Variables changes
             in pointed to type 'struct S':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
     -           'int S::m1', at offset 32 (in bits)
     +           'int m1', at offset 32 (in bits)
       
      -  [C] 'method S::S(int)' has some indirect sub-type changes:
      +  [C] 'method S::S()' has some indirect sub-type changes:
     @@ tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
      
       ## tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt ##
      @@
     --Functions changes summary: 0 Removed, 5 Changed (195 filtered out), 13 Added functions
     -+Functions changes summary: 0 Removed, 5 Changed (206 filtered out), 13 Added functions
     +-Functions changes summary: 0 Removed, 11 Changed (189 filtered out), 13 Added functions
     ++Functions changes summary: 0 Removed, 11 Changed (200 filtered out), 13 Added functions
       Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       Function symbols changes summary: 0 Removed, 0 Added function symbol not referenced by debug info
       Variable symbols changes summary: 0 Removed, 6 Added variable symbols not referenced by debug info
      @@ tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt: Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     -                     no member function changes (10 filtered);
     +     parameter 2 of type 'void**' was removed
       
         [C] 'method std::codecvt_byname<wchar_t, char, __mbstate_t>* std::codecvt_byname<wchar_t, char, __mbstate_t>::codecvt_byname(const char*, std::size_t)' has some indirect sub-type changes:
      -    Please note that the symbol of this function is _ZNSt14codecvt_bynameIwc11__mbstate_tEC1EPKcj@@GLIBCXX_3.4
     @@ tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt: Variable symb
      
       ## tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt ##
      @@
     --Functions changes summary: 0 Removed, 5 Changed (195 filtered out), 13 Added functions
     -+Functions changes summary: 0 Removed, 5 Changed (206 filtered out), 13 Added functions
     +-Functions changes summary: 0 Removed, 11 Changed (189 filtered out), 13 Added functions
     ++Functions changes summary: 0 Removed, 11 Changed (200 filtered out), 13 Added functions
       Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       Function symbols changes summary: 0 Removed, 0 Added function symbol not referenced by debug info
       Variable symbols changes summary: 0 Removed, 6 Added variable symbols not referenced by debug info
      @@ tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt: Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     -                     no member function changes (10 filtered);
     +     parameter 2 of type 'void**' was removed
       
         [C] 'method std::codecvt_byname<wchar_t, char, __mbstate_t>* std::codecvt_byname<wchar_t, char, __mbstate_t>::codecvt_byname(const char*, std::size_t)' at codecvt.h:462:1 has some indirect sub-type changes:
      -    Please note that the symbol of this function is _ZNSt14codecvt_bynameIwc11__mbstate_tEC1EPKcj@@GLIBCXX_3.4
     @@ tests/data/test-read-dwarf/test12-pr18844.so.abi
                 <member-function access='public' constructor='yes'>
      -            <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC1EPNS0_22ScatterGatherAlgorithmE'>
      +            <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE'>
     -               <parameter type-id='type-id-3644' is-artificial='yes'/>
     +               <parameter type-id='type-id-3646' is-artificial='yes'/>
                     <parameter type-id='type-id-3682'/>
                     <return type-id='type-id-60'/>
                   </function-decl>
     @@ tests/data/test-read-dwarf/test12-pr18844.so.abi
                 <member-function access='public' destructor='yes'>
      -            <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD1Ev'>
      +            <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD2Ev'>
     -               <parameter type-id='type-id-3644' is-artificial='yes'/>
     +               <parameter type-id='type-id-3646' is-artificial='yes'/>
                     <return type-id='type-id-60'/>
                   </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test12-pr18844.so.abi
                 <member-function access='public' constructor='yes'>
      -            <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC1EPNS0_22ScatterGatherAlgorithmE'>
      +            <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE'>
     -               <parameter type-id='type-id-3644' is-artificial='yes'/>
     +               <parameter type-id='type-id-3646' is-artificial='yes'/>
                     <parameter type-id='type-id-3682'/>
                     <return type-id='type-id-60'/>
                   </function-decl>
     @@ tests/data/test-read-dwarf/test12-pr18844.so.abi
                 <member-function access='public' destructor='yes'>
      -            <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD1Ev'>
      +            <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD2Ev'>
     -               <parameter type-id='type-id-3644' is-artificial='yes'/>
     +               <parameter type-id='type-id-3646' is-artificial='yes'/>
                     <return type-id='type-id-60'/>
                   </function-decl>
      
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
      +    <function-decl name='__interceptor_mlock' mangled-name='__interceptor_mlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlock'>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
             <parameter type-id='type-id-106' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_munlock' mangled-name='munlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='munlock'>
      +    <function-decl name='__interceptor_munlock' mangled-name='__interceptor_munlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_munlock'>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
             <parameter type-id='type-id-106' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1791' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_mlockall' mangled-name='mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mlockall'>
      +    <function-decl name='__interceptor_mlockall' mangled-name='__interceptor_mlockall' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mlockall'>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='tms' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
      @@
             <parameter type-id='type-id-1376' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_drand48_r' mangled-name='drand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drand48_r'>
      +    <function-decl name='__interceptor_drand48_r' mangled-name='__interceptor_drand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_drand48_r'>
             <parameter type-id='type-id-1' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
             <parameter type-id='type-id-1266' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-42' name='signp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2795' column='1'/>
             <return type-id='type-id-588'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1266' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
      @@
             <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2685' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_tempnam' mangled-name='tempnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tempnam'>
      +    <function-decl name='__interceptor_tempnam' mangled-name='__interceptor_tempnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tempnam'>
     -       <parameter type-id='type-id-27' name='dir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
     -       <parameter type-id='type-id-27' name='pfx' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='dir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
     +       <parameter type-id='type-id-28' name='pfx' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2670' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_tmpnam_r' mangled-name='tmpnam_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tmpnam_r'>
      +    <function-decl name='__interceptor_tmpnam_r' mangled-name='__interceptor_tmpnam_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tmpnam_r'>
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_tmpnam' mangled-name='tmpnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tmpnam'>
      +    <function-decl name='__interceptor_tmpnam' mangled-name='__interceptor_tmpnam' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_tmpnam'>
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2657' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getaffinity_np' mangled-name='pthread_attr_getaffinity_np' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getaffinity_np'>
      +    <function-decl name='__interceptor_pthread_attr_getaffinity_np' mangled-name='__interceptor_pthread_attr_getaffinity_np' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getaffinity_np'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='cpuset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2621' column='1'/>
      @@
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getstack' mangled-name='pthread_attr_getstack' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getstack'>
      +    <function-decl name='__interceptor_pthread_attr_getstack' mangled-name='__interceptor_pthread_attr_getstack' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getstack'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1137' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
      @@
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getscope' mangled-name='pthread_attr_getscope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getscope'>
      +    <function-decl name='__interceptor_pthread_attr_getscope' mangled-name='__interceptor_pthread_attr_getscope' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getscope'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getschedpolicy' mangled-name='pthread_attr_getschedpolicy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getschedpolicy'>
      +    <function-decl name='__interceptor_pthread_attr_getschedpolicy' mangled-name='__interceptor_pthread_attr_getschedpolicy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getschedpolicy'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getguardsize' mangled-name='pthread_attr_getguardsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2576' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getguardsize'>
      +    <function-decl name='__interceptor_pthread_attr_getguardsize' mangled-name='__interceptor_pthread_attr_getguardsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2576' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getguardsize'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_attr_getdetachstate' mangled-name='pthread_attr_getdetachstate' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_attr_getdetachstate'>
      +    <function-decl name='__interceptor_pthread_attr_getdetachstate' mangled-name='__interceptor_pthread_attr_getdetachstate' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getdetachstate'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_ether_aton_r' mangled-name='ether_aton_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_aton_r'>
      +    <function-decl name='__interceptor_ether_aton_r' mangled-name='__interceptor_ether_aton_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_aton_r'>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
             <return type-id='type-id-1169'/>
           </function-decl>
      -    <function-decl name='__interceptor_ether_ntoa_r' mangled-name='ether_ntoa_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_ntoa_r'>
      +    <function-decl name='__interceptor_ether_ntoa_r' mangled-name='__interceptor_ether_ntoa_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntoa_r'>
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_ether_line' mangled-name='ether_line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_line'>
      +    <function-decl name='__interceptor_ether_line' mangled-name='__interceptor_ether_line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_line'>
     -       <parameter type-id='type-id-27' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
     +       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
     -       <parameter type-id='type-id-27' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_ether_hostton' mangled-name='ether_hostton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_hostton'>
      +    <function-decl name='__interceptor_ether_hostton' mangled-name='__interceptor_ether_hostton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_hostton'>
     -       <parameter type-id='type-id-27' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     +       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_ether_ntohost' mangled-name='ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ether_ntohost'>
      +    <function-decl name='__interceptor_ether_ntohost' mangled-name='__interceptor_ether_ntohost' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_ntohost'>
     -       <parameter type-id='type-id-27' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     +       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1169' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2444' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_initgroups' mangled-name='initgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='initgroups'>
      +    <function-decl name='__interceptor_initgroups' mangled-name='__interceptor_initgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_initgroups'>
     -       <parameter type-id='type-id-27' name='user' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
     +       <parameter type-id='type-id-28' name='user' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
             <parameter type-id='type-id-284' name='group' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2431' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_fstatvfs64' mangled-name='fstatvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fstatvfs64'>
      +    <function-decl name='__interceptor_fstatvfs64' mangled-name='__interceptor_fstatvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstatvfs64'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_statvfs64' mangled-name='statvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='statvfs64'>
      +    <function-decl name='__interceptor_statvfs64' mangled-name='__interceptor_statvfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_statvfs64'>
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_fstatfs64' mangled-name='fstatfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fstatfs64'>
      +    <function-decl name='__interceptor_fstatfs64' mangled-name='__interceptor_fstatfs64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fstatfs64'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2408' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_getmntent_r' mangled-name='getmntent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntent_r'>
      +    <function-decl name='__interceptor_getmntent_r' mangled-name='__interceptor_getmntent_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getmntent_r'>
             <parameter type-id='type-id-1' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
             <parameter type-id='type-id-1188' name='mntbuf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_cond_signal'>
      +    <function-decl name='__interceptor_pthread_cond_signal' mangled-name='__interceptor_pthread_cond_signal' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_cond_signal'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_lock'>
      +    <function-decl name='__interceptor_pthread_mutex_lock' mangled-name='__interceptor_pthread_mutex_lock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_lock'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor__exit' mangled-name='_exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_exit'>
      +    <function-decl name='__interceptor__exit' mangled-name='__interceptor__exit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor__exit'>
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1197' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sigpending' mangled-name='sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigpending'>
      +    <function-decl name='__interceptor_sigpending' mangled-name='__interceptor_sigpending' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigpending'>
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sigfillset' mangled-name='sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigfillset'>
      +    <function-decl name='__interceptor_sigfillset' mangled-name='__interceptor_sigfillset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigfillset'>
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2148' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sigwaitinfo' mangled-name='sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigwaitinfo'>
      +    <function-decl name='__interceptor_sigwaitinfo' mangled-name='__interceptor_sigwaitinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigwaitinfo'>
             <parameter type-id='type-id-1197' name='set' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
             <parameter type-id='type-id-1' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_ppoll' mangled-name='ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppoll'>
      +    <function-decl name='__interceptor_ppoll' mangled-name='__interceptor_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ppoll'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1440' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
             <parameter type-id='type-id-1' name='timeout_ts' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
             <parameter type-id='type-id-1197' name='sigmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_poll' mangled-name='poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='poll'>
      +    <function-decl name='__interceptor_poll' mangled-name='__interceptor_poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_poll'>
             <parameter type-id='type-id-1196' name='fds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
             <parameter type-id='type-id-1440' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
     -       <parameter type-id='type-id-25' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
     +       <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
      @@
             <parameter type-id='type-id-627' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xpg_strerror_r'>
      +    <function-decl name='__interceptor___xpg_strerror_r' mangled-name='__interceptor___xpg_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xpg_strerror_r'>
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
             <parameter type-id='type-id-617' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1874' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_strerror_r' mangled-name='strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strerror_r'>
      +    <function-decl name='__interceptor_strerror_r' mangled-name='__interceptor_strerror_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strerror_r'>
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
             <parameter type-id='type-id-617' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1846' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_sched_getaffinity' mangled-name='sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_getaffinity'>
      +    <function-decl name='__interceptor_sched_getaffinity' mangled-name='__interceptor_sched_getaffinity' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sched_getaffinity'>
     -       <parameter type-id='type-id-25' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
     +       <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
             <parameter type-id='type-id-617' name='cpusetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
             <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1820' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_confstr' mangled-name='confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='confstr'>
      +    <function-decl name='__interceptor_confstr' mangled-name='__interceptor_confstr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_confstr'>
     -       <parameter type-id='type-id-25' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
     +       <parameter type-id='type-id-10' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
             <parameter type-id='type-id-617' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1806' column='1'/>
             <return type-id='type-id-617'/>
           </function-decl>
      -    <function-decl name='__interceptor_canonicalize_file_name' mangled-name='canonicalize_file_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='canonicalize_file_name'>
      +    <function-decl name='__interceptor_canonicalize_file_name' mangled-name='__interceptor_canonicalize_file_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_canonicalize_file_name'>
             <parameter type-id='type-id-2'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
           </function-decl>
      -    <function-decl name='__interceptor_wcsrtombs' mangled-name='wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wcsrtombs'>
      +    <function-decl name='__interceptor_wcsrtombs' mangled-name='__interceptor_wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsrtombs'>
     -       <parameter type-id='type-id-27' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
     +       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
             <parameter type-id='type-id-1261' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
             <parameter type-id='type-id-617' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
      @@
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
      +    <function-decl name='__interceptor_strtoumax' mangled-name='__interceptor_strtoumax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoumax'>
             <parameter type-id='type-id-2' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
             <parameter type-id='type-id-1227' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
     -       <parameter type-id='type-id-25' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
     +       <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
             <return type-id='type-id-629'/>
           </function-decl>
      -    <function-decl name='__interceptor_strtoimax' mangled-name='strtoimax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strtoimax'>
      +    <function-decl name='__interceptor_strtoimax' mangled-name='__interceptor_strtoimax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoimax'>
             <parameter type-id='type-id-2' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
             <parameter type-id='type-id-1227' name='endptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
     -       <parameter type-id='type-id-25' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
     +       <parameter type-id='type-id-10' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
             <return type-id='type-id-629'/>
           </function-decl>
      -    <function-decl name='__interceptor_get_current_dir_name' mangled-name='get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_current_dir_name'>
      +    <function-decl name='__interceptor_get_current_dir_name' mangled-name='__interceptor_get_current_dir_name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_get_current_dir_name'>
     -       <parameter type-id='type-id-25' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-10' name='errnum' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1833' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_getcwd' mangled-name='getcwd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getcwd'>
      +    <function-decl name='__interceptor_getcwd' mangled-name='__interceptor_getcwd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getcwd'>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1'/>
             <parameter type-id='type-id-617' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1586' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
      @@
             <parameter type-id='type-id-1' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1'/>
             <return type-id='type-id-1164'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_sysinfo' mangled-name='sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysinfo'>
      +    <function-decl name='__interceptor_sysinfo' mangled-name='__interceptor_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sysinfo'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_getpeername' mangled-name='getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getpeername'>
      +    <function-decl name='__interceptor_getpeername' mangled-name='__interceptor_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getpeername'>
     -       <parameter type-id='type-id-25' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
     +       <parameter type-id='type-id-10' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
             <parameter type-id='type-id-219' name='addrlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1437' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_modfl' mangled-name='modfl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='modfl'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <return type-id='type-id-588'/>
      @@
             <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_gethostbyname_r' mangled-name='gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname_r'>
      +    <function-decl name='__interceptor_gethostbyname_r' mangled-name='__interceptor_gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname_r'>
     -       <parameter type-id='type-id-27' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
     +       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
             <parameter type-id='type-id-1173' name='ret' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
     -       <parameter type-id='type-id-27' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
     +       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
      @@
             <parameter type-id='type-id-42' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_gethostbyaddr_r' mangled-name='gethostbyaddr_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyaddr_r'>
      +    <function-decl name='__interceptor_gethostbyaddr_r' mangled-name='__interceptor_gethostbyaddr_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyaddr_r'>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
     -       <parameter type-id='type-id-25' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
     -       <parameter type-id='type-id-25' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
     +       <parameter type-id='type-id-10' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
     +       <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
     +       <parameter type-id='type-id-10' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
             <return type-id='type-id-1173'/>
           </function-decl>
      -    <function-decl name='__interceptor_gethostbyname' mangled-name='gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gethostbyname'>
      +    <function-decl name='__interceptor_gethostbyname' mangled-name='__interceptor_gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname'>
     -       <parameter type-id='type-id-27' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
     +       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
             <return type-id='type-id-1173'/>
           </function-decl>
      @@
             <parameter type-id='type-id-42' name='param' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1070' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_inet_aton' mangled-name='inet_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inet_aton'>
      +    <function-decl name='__interceptor_inet_aton' mangled-name='__interceptor_inet_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inet_aton'>
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-284' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1024' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_wait4' mangled-name='wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait4'>
      +    <function-decl name='__interceptor_wait4' mangled-name='__interceptor_wait4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wait4'>
     -       <parameter type-id='type-id-25' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
     +       <parameter type-id='type-id-10' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
             <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
     -       <parameter type-id='type-id-25' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
     +       <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
             <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1003' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_wait3' mangled-name='wait3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait3'>
      +    <function-decl name='__interceptor_wait3' mangled-name='__interceptor_wait3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wait3'>
             <parameter type-id='type-id-42' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
     -       <parameter type-id='type-id-25' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
     +       <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
             <parameter type-id='type-id-1' name='rusage' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='993' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='options' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='985' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_waitid' mangled-name='waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='waitid'>
      +    <function-decl name='__interceptor_waitid' mangled-name='__interceptor_waitid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_waitid'>
     -       <parameter type-id='type-id-25' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
     -       <parameter type-id='type-id-25' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
     +       <parameter type-id='type-id-10' name='idtype' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
     +       <parameter type-id='type-id-10' name='id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
             <parameter type-id='type-id-1' name='infop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='976' column='1'/>
      @@
             <parameter type-id='type-id-1' name='old_value' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='832' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_getitimer' mangled-name='getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getitimer'>
      +    <function-decl name='__interceptor_getitimer' mangled-name='__interceptor_getitimer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getitimer'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2416' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_clock_settime' mangled-name='clock_settime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_settime'>
      +    <function-decl name='__interceptor_clock_settime' mangled-name='__interceptor_clock_settime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_clock_settime'>
             <parameter type-id='type-id-284' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
             <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_clock_gettime' mangled-name='clock_gettime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clock_gettime'>
      +    <function-decl name='__interceptor_clock_gettime' mangled-name='__interceptor_clock_gettime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_clock_gettime'>
             <parameter type-id='type-id-284' name='clk_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
             <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='tp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='808' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_ioctl' mangled-name='ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ioctl'>
      +    <function-decl name='__interceptor_ioctl' mangled-name='__interceptor_ioctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ioctl'>
     -       <parameter type-id='type-id-25' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
     +       <parameter type-id='type-id-10' name='d' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
             <parameter type-id='type-id-211' name='request' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
             <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='667' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vfscanf'>
      +    <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__interceptor___isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vfscanf'>
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_fscanf' mangled-name='__isoc99_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_fscanf'>
      +    <function-decl name='__interceptor___isoc99_fscanf' mangled-name='__interceptor___isoc99_fscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_fscanf'>
             <parameter type-id='type-id-1' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='632' column='1'/>
             <parameter is-variadic='yes'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vsscanf'>
      +    <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__interceptor___isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vsscanf'>
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_sscanf' mangled-name='__isoc99_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_sscanf'>
      +    <function-decl name='__interceptor___isoc99_sscanf' mangled-name='__interceptor___isoc99_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_sscanf'>
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <parameter is-variadic='yes'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_vscanf'>
      +    <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__interceptor___isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vscanf'>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___isoc99_scanf' mangled-name='__isoc99_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__isoc99_scanf'>
      +    <function-decl name='__interceptor___isoc99_scanf' mangled-name='__interceptor___isoc99_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_scanf'>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
             <parameter is-variadic='yes'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_vfscanf' mangled-name='vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vfscanf'>
      +    <function-decl name='__interceptor_vfscanf' mangled-name='__interceptor_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vfscanf'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
      @@
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sscanf' mangled-name='sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'>
      +    <function-decl name='__interceptor_sscanf' mangled-name='__interceptor_sscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sscanf'>
             <parameter type-id='type-id-2' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='635' column='1'/>
             <parameter is-variadic='yes'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_vscanf' mangled-name='vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscanf'>
      +    <function-decl name='__interceptor_vscanf' mangled-name='__interceptor_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vscanf'>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
             <parameter type-id='type-id-1406' name='ap' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_scanf' mangled-name='scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scanf'>
      +    <function-decl name='__interceptor_scanf' mangled-name='__interceptor_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scanf'>
             <parameter type-id='type-id-2' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='629' column='1'/>
             <parameter is-variadic='yes'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1199' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_asctime_r' mangled-name='asctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='asctime_r'>
      +    <function-decl name='__interceptor_asctime_r' mangled-name='__interceptor_asctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_asctime_r'>
             <parameter type-id='type-id-1199' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
     -       <parameter type-id='type-id-27' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
     +       <return type-id='type-id-28'/>
      @@
             <parameter type-id='type-id-1199' name='tm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='516' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_ctime_r' mangled-name='ctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ctime_r'>
      +    <function-decl name='__interceptor_ctime_r' mangled-name='__interceptor_ctime_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ctime_r'>
             <parameter type-id='type-id-183' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1'/>
     -       <parameter type-id='type-id-27' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='506' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_ctime' mangled-name='ctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ctime'>
      +    <function-decl name='__interceptor_ctime' mangled-name='__interceptor_ctime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ctime'>
             <parameter type-id='type-id-183' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
           </function-decl>
      -    <function-decl name='__interceptor_prctl' mangled-name='prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='prctl'>
      +    <function-decl name='__interceptor_prctl' mangled-name='__interceptor_prctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_prctl'>
     -       <parameter type-id='type-id-25' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
     +       <parameter type-id='type-id-10' name='option' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
             <parameter type-id='type-id-33' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
             <parameter type-id='type-id-33' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
      @@
             <parameter type-id='type-id-33' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='411' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pwritev64' mangled-name='pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev64'>
      +    <function-decl name='__interceptor_pwritev64' mangled-name='__interceptor_pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev64'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <parameter type-id='type-id-1185' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <parameter type-id='type-id-631' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_pwritev' mangled-name='pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwritev'>
      +    <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <parameter type-id='type-id-1185' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_pwrite64' mangled-name='pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite64'>
      +    <function-decl name='__interceptor_pwrite64' mangled-name='__interceptor_pwrite64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite64'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
             <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
             <parameter type-id='type-id-631' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
             <parameter type-id='type-id-631' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='347' column='1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
           </function-decl>
      -    <function-decl name='__interceptor_pwrite' mangled-name='pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pwrite'>
      +    <function-decl name='__interceptor_pwrite' mangled-name='__interceptor_pwrite' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwrite'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
             <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
             <parameter type-id='type-id-617' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
             <parameter type-id='type-id-632' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
           </function-decl>
      -    <function-decl name='__interceptor_write' mangled-name='write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='write'>
      +    <function-decl name='__interceptor_write' mangled-name='__interceptor_write' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_write'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <parameter type-id='type-id-617' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_preadv64' mangled-name='preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv64'>
      +    <function-decl name='__interceptor_preadv64' mangled-name='__interceptor_preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv64'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <parameter type-id='type-id-1185' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <parameter type-id='type-id-631' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_preadv' mangled-name='preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preadv'>
      +    <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <parameter type-id='type-id-1185' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <parameter type-id='type-id-632' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_readv' mangled-name='readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='readv'>
      +    <function-decl name='__interceptor_readv' mangled-name='__interceptor_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readv'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
             <parameter type-id='type-id-1185' name='iov' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
     -       <parameter type-id='type-id-25' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
     +       <parameter type-id='type-id-10' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
      @@
             <parameter type-id='type-id-632' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='332' column='1'/>
             <return type-id='type-id-619'/>
           </function-decl>
      -    <function-decl name='__interceptor_read' mangled-name='read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='read'>
      +    <function-decl name='__interceptor_read' mangled-name='__interceptor_read' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_read'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <parameter type-id='type-id-1' name='ptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
             <parameter type-id='type-id-617' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='316' column='1'/>
      @@
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-617' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='141' column='1'/>
      @@
             <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_textdomain' mangled-name='textdomain' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='textdomain'>
      +    <function-decl name='__interceptor_textdomain' mangled-name='__interceptor_textdomain' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_textdomain'>
             <parameter type-id='type-id-2'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='rv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1765' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_gettimeofday' mangled-name='gettimeofday' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gettimeofday'>
      +    <function-decl name='__interceptor_gettimeofday' mangled-name='__interceptor_gettimeofday' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gettimeofday'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_kill' mangled-name='pthread_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_kill'>
      +    <function-decl name='__interceptor_pthread_kill' mangled-name='__interceptor_pthread_kill' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_kill'>
             <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     -       <parameter type-id='type-id-25' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1241' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1710' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sigaction' mangled-name='sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sigaction'>
      +    <function-decl name='__interceptor_sigaction' mangled-name='__interceptor_sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigaction'>
     -       <parameter type-id='type-id-25' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
     +       <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
             <parameter type-id='type-id-1381' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
             <parameter type-id='type-id-1381' name='old' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
      @@
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
           </function-decl>
      -    <function-decl name='__interceptor_epoll_wait' mangled-name='epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_wait'>
      +    <function-decl name='__interceptor_epoll_wait' mangled-name='__interceptor_epoll_wait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_wait'>
     -       <parameter type-id='type-id-25' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     +       <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
             <parameter type-id='type-id-1' name='ev' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     -       <parameter type-id='type-id-25' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     -       <parameter type-id='type-id-25' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='cnt' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     +       <parameter type-id='type-id-10' name='timeout' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1619' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_epoll_ctl' mangled-name='epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_ctl'>
      +    <function-decl name='__interceptor_epoll_ctl' mangled-name='__interceptor_epoll_ctl' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_ctl'>
     -       <parameter type-id='type-id-25' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     -       <parameter type-id='type-id-25' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     +       <parameter type-id='type-id-10' name='epfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     +       <parameter type-id='type-id-10' name='op' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1607' column='1'/>
      @@
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1599' column='1'/>
             <return type-id='type-id-1'/>
           </function-decl>
      -    <function-decl name='__interceptor_rmdir' mangled-name='rmdir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rmdir'>
      +    <function-decl name='__interceptor_rmdir' mangled-name='__interceptor_rmdir' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_rmdir'>
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-2' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1586' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_abort' mangled-name='abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='abort'>
      +    <function-decl name='__interceptor_abort' mangled-name='__interceptor_abort' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_abort'>
     -       <parameter type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
             <return type-id='type-id-4'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_fwrite' mangled-name='fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fwrite'>
      +    <function-decl name='__interceptor_fwrite' mangled-name='__interceptor_fwrite' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_fwrite'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-106' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
             <parameter type-id='type-id-106' name='nmemb' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1563' column='1'/>
      @@
     -       <parameter type-id='type-id-27' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1512' column='1'/>
     +       <parameter type-id='type-id-28' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1512' column='1'/>
             <return type-id='type-id-1'/>
           </function-decl>
      -    <function-decl name='__interceptor_unlink' mangled-name='unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlink'>
      +    <function-decl name='__interceptor_unlink' mangled-name='__interceptor_unlink' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1505' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_unlink'>
     -       <parameter type-id='type-id-27' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1592' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_recv' mangled-name='recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='recv'>
      +    <function-decl name='__interceptor_recv' mangled-name='__interceptor_recv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recv'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <parameter type-id='type-id-638' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1484' column='1'/>
             <return type-id='type-id-638'/>
           </function-decl>
      -    <function-decl name='__interceptor_send' mangled-name='send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='send'>
      +    <function-decl name='__interceptor_send' mangled-name='__interceptor_send' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_send'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
             <parameter type-id='type-id-638' name='len' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1494' column='1'/>
      @@
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_close' mangled-name='close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='close'>
      +    <function-decl name='__interceptor_close' mangled-name='__interceptor_close' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_close'>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_epoll_create1' mangled-name='epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='epoll_create1'>
      +    <function-decl name='__interceptor_epoll_create1' mangled-name='__interceptor_epoll_create1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_epoll_create1'>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_bind' mangled-name='bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bind'>
      +    <function-decl name='__interceptor_bind' mangled-name='__interceptor_bind' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_bind'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <parameter type-id='type-id-211' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_connect' mangled-name='connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='connect'>
      +    <function-decl name='__interceptor_connect' mangled-name='__interceptor_connect' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_connect'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
             <parameter type-id='type-id-211' name='addrlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1400' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_inotify_init1' mangled-name='inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inotify_init1'>
      +    <function-decl name='__interceptor_inotify_init1' mangled-name='__interceptor_inotify_init1' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_inotify_init1'>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_signalfd' mangled-name='signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='signalfd'>
      +    <function-decl name='__interceptor_signalfd' mangled-name='__interceptor_signalfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_signalfd'>
     -       <parameter type-id='type-id-25' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
     +       <parameter type-id='type-id-10' name='fd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
             <parameter type-id='type-id-1' name='mask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1349' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_eventfd' mangled-name='eventfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='eventfd'>
      +    <function-decl name='__interceptor_eventfd' mangled-name='__interceptor_eventfd' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_eventfd'>
             <parameter type-id='type-id-211' name='initval' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1341' column='1'/>
     +       <return type-id='type-id-10'/>
      @@
     -       <parameter type-id='type-id-25' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='protocol' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1375' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_dup2' mangled-name='dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup2'>
      +    <function-decl name='__interceptor_dup2' mangled-name='__interceptor_dup2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup2'>
     -       <parameter type-id='type-id-25'/>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_dup' mangled-name='dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dup'>
      +    <function-decl name='__interceptor_dup' mangled-name='__interceptor_dup' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_dup'>
     -       <parameter type-id='type-id-25'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
     -       <parameter type-id='type-id-25' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_open' mangled-name='open' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='open'>
      +    <function-decl name='__interceptor_open' mangled-name='__interceptor_open' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_open'>
             <parameter type-id='type-id-2' name='name' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     -       <parameter type-id='type-id-25' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     -       <parameter type-id='type-id-25' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     +       <parameter type-id='type-id-10' name='flags' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
     +       <parameter type-id='type-id-10' name='mode' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1293' column='1'/>
      @@
             <parameter type-id='type-id-1' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_lstat64' mangled-name='lstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lstat64'>
      +    <function-decl name='__interceptor_lstat64' mangled-name='__interceptor_lstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lstat64'>
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___lxstat64' mangled-name='__lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat64'>
      +    <function-decl name='__interceptor___lxstat64' mangled-name='__interceptor___lxstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___lxstat64'>
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
      @@
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___lxstat' mangled-name='__lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lxstat'>
      +    <function-decl name='__interceptor___lxstat' mangled-name='__interceptor___lxstat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___lxstat'>
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
      @@
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor___xstat64' mangled-name='__xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__xstat64'>
      +    <function-decl name='__interceptor___xstat64' mangled-name='__interceptor___xstat64' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___xstat64'>
     -       <parameter type-id='type-id-25' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     +       <parameter type-id='type-id-10' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1034' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_stat' mangled-name='stat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stat'>
      +    <function-decl name='__interceptor_stat' mangled-name='__interceptor_stat' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_stat'>
             <parameter type-id='type-id-2' name='cp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
             <parameter type-id='type-id-1' name='dst' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1053' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sem_timedwait' mangled-name='sem_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_timedwait'>
      +    <function-decl name='__interceptor_sem_timedwait' mangled-name='__interceptor_sem_timedwait' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_timedwait'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sem_destroy' mangled-name='sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_destroy'>
      +    <function-decl name='__interceptor_sem_destroy' mangled-name='__interceptor_sem_destroy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_destroy'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sem_init' mangled-name='sem_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sem_init'>
      +    <function-decl name='__interceptor_sem_init' mangled-name='__interceptor_sem_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sem_init'>
             <parameter type-id='type-id-1' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
     -       <parameter type-id='type-id-25' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
     +       <parameter type-id='type-id-10' name='pshared' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
             <parameter type-id='type-id-211' name='value' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1162' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_once' mangled-name='pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_once'>
      +    <function-decl name='__interceptor_pthread_once' mangled-name='__interceptor_pthread_once' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_once'>
             <parameter type-id='type-id-1' name='o' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
             <parameter type-id='type-id-187' name='f' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1133' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_barrier_init'>
      +    <function-decl name='__interceptor_pthread_barrier_init' mangled-name='__interceptor_pthread_barrier_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_barrier_init'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-211' name='count' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1107' column='1'/>
      @@
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_trywrlock'>
      +    <function-decl name='__interceptor_pthread_rwlock_trywrlock' mangled-name='__interceptor_pthread_rwlock_trywrlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_trywrlock'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_rwlock_timedrdlock' mangled-name='pthread_rwlock_timedrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_timedrdlock'>
      +    <function-decl name='__interceptor_pthread_rwlock_timedrdlock' mangled-name='__interceptor_pthread_rwlock_timedrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_timedrdlock'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_rwlock_tryrdlock'>
      +    <function-decl name='__interceptor_pthread_rwlock_tryrdlock' mangled-name='__interceptor_pthread_rwlock_tryrdlock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_rwlock_tryrdlock'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_lock'>
      +    <function-decl name='__interceptor_pthread_spin_lock' mangled-name='__interceptor_pthread_spin_lock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_lock'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_spin_init' mangled-name='pthread_spin_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_spin_init'>
      +    <function-decl name='__interceptor_pthread_spin_init' mangled-name='__interceptor_pthread_spin_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_spin_init'>
             <parameter type-id='type-id-1' name='tid' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     -       <parameter type-id='type-id-25' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <parameter type-id='type-id-10' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1743' column='1'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_trylock'>
      +    <function-decl name='__interceptor_pthread_mutex_trylock' mangled-name='__interceptor_pthread_mutex_trylock' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_trylock'>
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      @@
             <parameter type-id='type-id-1' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='423' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_pthread_mutex_init' mangled-name='pthread_mutex_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pthread_mutex_init'>
      +    <function-decl name='__interceptor_pthread_mutex_init' mangled-name='__interceptor_pthread_mutex_init' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_mutex_init'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-157' name='off' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='749' column='1'/>
             <return type-id='type-id-1'/>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
      +    <function-decl name='__interceptor_mmap' mangled-name='__interceptor_mmap' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_mmap'>
             <parameter type-id='type-id-1' name='addr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
             <parameter type-id='type-id-638' name='sz' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
     -       <parameter type-id='type-id-25' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
     +       <parameter type-id='type-id-10' name='prot' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='735' column='1'/>
      @@
             <parameter type-id='type-id-2' name='s2' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='705' column='1'/>
             <return type-id='type-id-2'/>
           </function-decl>
      -    <function-decl name='__interceptor_strncpy' mangled-name='strncpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncpy'>
      +    <function-decl name='__interceptor_strncpy' mangled-name='__interceptor_strncpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strncpy'>
     -       <parameter type-id='type-id-27' name='dst' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
     -       <parameter type-id='type-id-27' name='src' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
     +       <parameter type-id='type-id-28' name='dst' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
     +       <parameter type-id='type-id-28' name='src' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
             <parameter type-id='type-id-106' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='697' column='1'/>
      @@
             <parameter type-id='type-id-2' name='src' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='689' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_strrchr' mangled-name='strrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strrchr'>
      +    <function-decl name='__interceptor_strrchr' mangled-name='__interceptor_strrchr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strrchr'>
     -       <parameter type-id='type-id-27' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     -       <parameter type-id='type-id-25' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     +       <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     +       <return type-id='type-id-28'/>
      @@
     -       <parameter type-id='type-id-25' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-10' name='c' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='683' column='1'/>
     +       <return type-id='type-id-28'/>
           </function-decl>
      -    <function-decl name='__interceptor_memmove' mangled-name='memmove' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memmove'>
      +    <function-decl name='__interceptor_memmove' mangled-name='__interceptor_memmove' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memmove'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-106'/>
      @@
             <parameter type-id='type-id-106' name='n' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='633' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_memcpy' mangled-name='memcpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memcpy'>
      +    <function-decl name='__interceptor_memcpy' mangled-name='__interceptor_memcpy' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_memcpy'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
      -    <function-decl name='__interceptor_realpath' mangled-name='realpath' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='realpath'>
      +    <function-decl name='__interceptor_realpath' mangled-name='__interceptor_realpath' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_realpath'>
             <parameter type-id='type-id-2' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1'/>
     -       <parameter type-id='type-id-27' name='resolved_path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1'/>
     -       <return type-id='type-id-27'/>
     +       <parameter type-id='type-id-28' name='resolved_path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1767' column='1'/>
     +       <return type-id='type-id-28'/>
      @@
     -       <parameter type-id='type-id-25' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
     +       <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
             <return type-id='type-id-4'/>
           </function-decl>
      -    <function-decl name='__interceptor_longjmp' mangled-name='longjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='longjmp'>
      +    <function-decl name='__interceptor_longjmp' mangled-name='__interceptor_longjmp' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_longjmp'>
             <parameter type-id='type-id-472' name='env' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
     -       <parameter type-id='type-id-25' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
     +       <parameter type-id='type-id-10' name='val' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='467' column='1'/>
             <return type-id='type-id-4'/>
           </function-decl>
      -    <function-decl name='__interceptor___cxa_atexit' mangled-name='__cxa_atexit' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_atexit'>
     @@ tests/data/test-read-dwarf/test15-pr18892.so.abi
             <parameter type-id='type-id-1' name='arg' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
             <parameter type-id='type-id-1' name='dso' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='356' column='1'/>
      @@
     -       <parameter type-id='type-id-25' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
     +       <parameter type-id='type-id-10' name='flag' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='259' column='1'/>
             <return type-id='type-id-1'/>
           </function-decl>
      -    <function-decl name='__interceptor_nanosleep' mangled-name='nanosleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nanosleep'>
      +    <function-decl name='__interceptor_nanosleep' mangled-name='__interceptor_nanosleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_nanosleep'>
             <parameter type-id='type-id-1' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
             <parameter type-id='type-id-1' name='r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
      @@
             <parameter type-id='type-id-638' name='usec' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='245' column='1'/>
     -       <return type-id='type-id-25'/>
     +       <return type-id='type-id-10'/>
           </function-decl>
      -    <function-decl name='__interceptor_sleep' mangled-name='sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sleep'>
      +    <function-decl name='__interceptor_sleep' mangled-name='__interceptor_sleep' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sleep'>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
                   <parameter type-id='type-id-1922' name='this' is-artificial='yes'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
     -@@
     -       <class-decl name='tuple&lt;long unsigned int const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1133'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1967'/>
     -         <member-function access='private'>
     --          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKmEEC1EOS2_'>
     -+          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2EOS2_'>
     -             <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-1128'/>
     -             <return type-id='type-id-154'/>
     -           </function-decl>
     -         </member-function>
     -         <member-function access='private'>
     --          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC1IvLb1EEES1_'>
     -+          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_'>
     -             <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-1217' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
     -             <return type-id='type-id-154'/>
     -@@
     -       <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1195'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1969'/>
     -         <member-function access='private'>
     --          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC1EOS4_'>
     -+          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2EOS4_'>
     -             <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-1194'/>
     -             <return type-id='type-id-154'/>
     -           </function-decl>
     -         </member-function>
     -         <member-function access='private'>
     --          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC2IvLb1EEES3_'>
     -+          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_'>
     -             <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-1442' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
     -             <return type-id='type-id-154'/>
      @@
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='public'>
      -          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC1IS2_bLb1EEEOT_OT0_'>
      +          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_'>
     -             <parameter type-id='type-id-2024' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1976' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1634' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
                   <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
     +@@
     +       <class-decl name='tuple&lt;long unsigned int const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1133'>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1978'/>
     +         <member-function access='private'>
     +-          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKmEEC1EOS2_'>
     ++          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2EOS2_'>
     +             <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1128'/>
     +             <return type-id='type-id-154'/>
     +           </function-decl>
     +         </member-function>
     +         <member-function access='private'>
     +-          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC1IvLb1EEES1_'>
     ++          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_'>
     +             <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1217' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
     +             <return type-id='type-id-154'/>
     +@@
     +       <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1195'>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1980'/>
     +         <member-function access='private'>
     +-          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC1EOS4_'>
     ++          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2EOS4_'>
     +             <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1194'/>
     +             <return type-id='type-id-154'/>
     +           </function-decl>
     +         </member-function>
     +         <member-function access='private'>
     +-          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC2IvLb1EEES3_'>
     ++          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_'>
     +             <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
     +             <return type-id='type-id-154'/>
      @@
                 </function-decl>
               </member-function>
               <member-function access='public'>
      -          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKmEEC2ES1_'>
      +          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_'>
     -             <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1217' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
                   <return type-id='type-id-154'/>
      @@
     -       <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1969'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2058'/>
     +       <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1980'>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2032'/>
               <member-function access='public'>
      -          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKPKvEEC1EOS4_'>
      +          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_'>
     -             <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-2060' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
     +             <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2034' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
                   <return type-id='type-id-154'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='public'>
      -          <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC1ES3_'>
      +          <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_'>
     -             <parameter type-id='type-id-2075' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2068' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1442' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
                   <return type-id='type-id-154'/>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
                 <parameter type-id='type-id-2988' name='phase' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='140' column='1'/>
      @@
             <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1195'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1969'/>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1980'/>
               <member-function access='private'>
      -          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC1EOS4_'>
      +          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2EOS4_'>
     -             <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1194'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='private'>
      -          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC2IvLb1EEES3_'>
      +          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_'>
     -             <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1442' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
                   <return type-id='type-id-154'/>
      @@
     -       <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1969'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2058'/>
     +       <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1980'>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2032'/>
               <member-function access='public'>
      -          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKPKvEEC1EOS4_'>
      +          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_'>
     -             <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
     -             <parameter type-id='type-id-2060' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
     +             <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2034' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
                   <return type-id='type-id-154'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='public'>
      -          <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC1ES3_'>
      +          <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_'>
     -             <parameter type-id='type-id-2075' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2068' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1442' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
                   <return type-id='type-id-154'/>
      @@
             <class-decl name='tuple&lt;long unsigned int const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1133'>
     -         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1967'/>
     +         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1978'/>
               <member-function access='private'>
      -          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKmEEC1EOS2_'>
      +          <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2EOS2_'>
     -             <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1128'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='private'>
      -          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC1IvLb1EEES1_'>
      +          <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_'>
     -             <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1217' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
                   <return type-id='type-id-154'/>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='public'>
      -          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKmEEC2ES1_'>
      +          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_'>
     -             <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1217' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
                   <return type-id='type-id-154'/>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
               <member-function access='public'>
      -          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC1IS2_bLb1EEEOT_OT0_'>
      +          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_'>
     -             <parameter type-id='type-id-2024' name='this' is-artificial='yes'/>
     +             <parameter type-id='type-id-1976' name='this' is-artificial='yes'/>
                   <parameter type-id='type-id-1634' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
                   <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
                       <return type-id='type-id-154'/>
                     </function-decl>
      @@
     -         <parameter type-id='type-id-2060' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
     +         <parameter type-id='type-id-2034' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
               <return type-id='type-id-1124'/>
             </function-decl>
      -      <function-decl name='get&lt;0ul, long unsigned int const&amp;&gt;' mangled-name='_ZSt3getILm0EJRKmEERNSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeERS6_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIRKmEERNSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeERS6_'>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
      -      <function-decl name='forward&lt;std::tuple&lt;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJEEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIIEEEOT_RNSt16remove_referenceIS2_E4typeE'>
      +      <function-decl name='forward&lt;std::tuple&lt;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJEEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIJEEEOT_RNSt16remove_referenceIS2_E4typeE'>
               <parameter type-id='type-id-3129' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
     -         <return type-id='type-id-2012'/>
     +         <return type-id='type-id-2023'/>
             </function-decl>
      -      <function-decl name='forward&lt;std::tuple&lt;long unsigned int const&amp;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJRKmEEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIIRKmEEEOT_RNSt16remove_referenceIS4_E4typeE'>
      +      <function-decl name='forward&lt;std::tuple&lt;long unsigned int const&amp;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJRKmEEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIJRKmEEEOT_RNSt16remove_referenceIS4_E4typeE'>
               <parameter type-id='type-id-3132' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
     -         <return type-id='type-id-2013'/>
     +         <return type-id='type-id-2024'/>
             </function-decl>
      @@
               <var-decl name='var_tab_len' type-id='type-id-25' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' line='480' column='1'/>
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test16-pr18904.so.abi
             <member-function access='public' destructor='yes'>
      -        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
      +        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD2Ev'>
     -           <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
     +           <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
                 <return type-id='type-id-154'/>
               </function-decl>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes'>
      -          <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1332' is-artificial='yes'/>
     +             <parameter type-id='type-id-1331' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1358' is-artificial='yes'/>
     +             <parameter type-id='type-id-1357' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC1EPKtbm@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC2EPKtbm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1377' is-artificial='yes'/>
     -             <parameter type-id='type-id-1374'/>
     +             <parameter type-id='type-id-1376' is-artificial='yes'/>
     +             <parameter type-id='type-id-1373'/>
                   <parameter type-id='type-id-10'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1377' is-artificial='yes'/>
     +             <parameter type-id='type-id-1376' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -              <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD1Ev@@GLIBCXX_3.4'>
      +              <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD2Ev@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1399' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1398' is-artificial='yes'/>
                       <parameter type-id='type-id-6' is-artificial='yes'/>
                       <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='private' destructor='yes'>
      -              <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4'>
      +              <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD2Ev@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1406' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1405' is-artificial='yes'/>
                       <parameter type-id='type-id-6' is-artificial='yes'/>
                       <return type-id='type-id-5'/>
                     </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='private' constructor='yes'>
      -              <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC1ERKS0_m@@GLIBCXX_3.4'>
      +              <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2ERKS0_m@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1406' is-artificial='yes'/>
     -                 <parameter type-id='type-id-1407'/>
     +                 <parameter type-id='type-id-1405' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1406'/>
                       <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-1220'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPNS_5_ImplE@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2EPNS_5_ImplE@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     -             <parameter type-id='type-id-1406'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
     +             <parameter type-id='type-id-1405'/>
                   <return type-id='type-id-5'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes'>
      -          <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPKc@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2EPKc@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-4'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_PKci@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_PKci@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-1220'/>
                   <parameter type-id='type-id-4'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1414' is-artificial='yes'/>
     +             <parameter type-id='type-id-1413' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1415' is-artificial='yes'/>
     +             <parameter type-id='type-id-1414' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1415' is-artificial='yes'/>
     +             <parameter type-id='type-id-1414' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1427' is-artificial='yes'/>
     +             <parameter type-id='type-id-1426' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1421' is-artificial='yes'/>
     +             <parameter type-id='type-id-1420' is-artificial='yes'/>
                   <parameter type-id='type-id-1671'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1421' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1420' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-1676'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1416' is-artificial='yes'/>
     +             <parameter type-id='type-id-1415' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1427' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1427' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1436' is-artificial='yes'/>
     +             <parameter type-id='type-id-1435' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1436' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1435' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1419' is-artificial='yes'/>
     +             <parameter type-id='type-id-1418' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1431' is-artificial='yes'/>
     +             <parameter type-id='type-id-1430' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1420' is-artificial='yes'/>
     +             <parameter type-id='type-id-1419' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1418' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1429' is-artificial='yes'/>
     +             <parameter type-id='type-id-1428' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1429' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-1750'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1413' is-artificial='yes'/>
     +             <parameter type-id='type-id-1412' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1413' is-artificial='yes'/>
     +             <parameter type-id='type-id-1412' is-artificial='yes'/>
                   <parameter type-id='type-id-1757'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-1764'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1423' is-artificial='yes'/>
     +             <parameter type-id='type-id-1422' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1834' is-artificial='yes'/>
     +             <parameter type-id='type-id-1805' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1834' is-artificial='yes'/>
     +             <parameter type-id='type-id-1805' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1837' is-artificial='yes'/>
     +             <parameter type-id='type-id-1808' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1837' is-artificial='yes'/>
     +             <parameter type-id='type-id-1808' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1849' is-artificial='yes'/>
     +             <parameter type-id='type-id-1820' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1854' is-artificial='yes'/>
     +             <parameter type-id='type-id-1825' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1858' is-artificial='yes'/>
     +             <parameter type-id='type-id-1829' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1858' is-artificial='yes'/>
     +             <parameter type-id='type-id-1829' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1861' is-artificial='yes'/>
     +             <parameter type-id='type-id-1832' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-2294' is-artificial='yes'/>
     +             <parameter type-id='type-id-2295' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC1ERKSs@@GLIBCXX_3.4'>
      +          <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC2ERKSs@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-2296' is-artificial='yes'/>
     +             <parameter type-id='type-id-2297' is-artificial='yes'/>
                   <parameter type-id='type-id-357'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1358' is-artificial='yes'/>
     +             <parameter type-id='type-id-1357' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -              <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD1Ev@@GLIBCXX_3.4'>
      +              <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD2Ev@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1399' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1398' is-artificial='yes'/>
                       <parameter type-id='type-id-6' is-artificial='yes'/>
                       <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='private' destructor='yes'>
      -              <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4'>
      +              <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD2Ev@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1406' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1405' is-artificial='yes'/>
                       <parameter type-id='type-id-6' is-artificial='yes'/>
                       <return type-id='type-id-5'/>
                     </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
                   <member-function access='private' constructor='yes'>
      -              <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC1ERKS0_m@@GLIBCXX_3.4'>
      +              <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2ERKS0_m@@GLIBCXX_3.4'>
     -                 <parameter type-id='type-id-1406' is-artificial='yes'/>
     -                 <parameter type-id='type-id-1407'/>
     +                 <parameter type-id='type-id-1405' is-artificial='yes'/>
     +                 <parameter type-id='type-id-1406'/>
                       <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-1220'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPNS_5_ImplE@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2EPNS_5_ImplE@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     -             <parameter type-id='type-id-1406'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
     +             <parameter type-id='type-id-1405'/>
                   <return type-id='type-id-5'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes'>
      -          <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPKc@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2EPKc@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-4'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_PKci@@GLIBCXX_3.4'>
      +          <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_PKci@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1443' is-artificial='yes'/>
     +             <parameter type-id='type-id-1442' is-artificial='yes'/>
                   <parameter type-id='type-id-1220'/>
                   <parameter type-id='type-id-4'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1389' is-artificial='yes'/>
     +             <parameter type-id='type-id-1388' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC1EPKtbm@@GLIBCXX_3.4'>
      +          <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC2EPKtbm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1377' is-artificial='yes'/>
     -             <parameter type-id='type-id-1374'/>
     +             <parameter type-id='type-id-1376' is-artificial='yes'/>
     +             <parameter type-id='type-id-1373'/>
                   <parameter type-id='type-id-10'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1377' is-artificial='yes'/>
     +             <parameter type-id='type-id-1376' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1427' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1427' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1416' is-artificial='yes'/>
     +             <parameter type-id='type-id-1415' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1413' is-artificial='yes'/>
     +             <parameter type-id='type-id-1412' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1413' is-artificial='yes'/>
     +             <parameter type-id='type-id-1412' is-artificial='yes'/>
                   <parameter type-id='type-id-1757'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-1764'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
      +          <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-96'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1425' is-artificial='yes'/>
     +             <parameter type-id='type-id-1424' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1849' is-artificial='yes'/>
     +             <parameter type-id='type-id-1820' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1854' is-artificial='yes'/>
     +             <parameter type-id='type-id-1825' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1418' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-1750'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1430' is-artificial='yes'/>
     +             <parameter type-id='type-id-1429' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1837' is-artificial='yes'/>
     +             <parameter type-id='type-id-1808' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1837' is-artificial='yes'/>
     +             <parameter type-id='type-id-1808' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1417' is-artificial='yes'/>
     +             <parameter type-id='type-id-1416' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1834' is-artificial='yes'/>
     +             <parameter type-id='type-id-1805' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1834' is-artificial='yes'/>
     +             <parameter type-id='type-id-1805' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1420' is-artificial='yes'/>
     +             <parameter type-id='type-id-1419' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1419' is-artificial='yes'/>
     +             <parameter type-id='type-id-1418' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1429' is-artificial='yes'/>
     +             <parameter type-id='type-id-1428' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1429' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1428' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1421' is-artificial='yes'/>
     +             <parameter type-id='type-id-1420' is-artificial='yes'/>
                   <parameter type-id='type-id-1671'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1421' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1420' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1858' is-artificial='yes'/>
     +             <parameter type-id='type-id-1829' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1858' is-artificial='yes'/>
     +             <parameter type-id='type-id-1829' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1423' is-artificial='yes'/>
     +             <parameter type-id='type-id-1422' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1431' is-artificial='yes'/>
     +             <parameter type-id='type-id-1430' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-1676'/>
                   <parameter type-id='type-id-96'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1433' is-artificial='yes'/>
     +             <parameter type-id='type-id-1432' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='public'>
      -          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1861' is-artificial='yes'/>
     +             <parameter type-id='type-id-1832' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1436' is-artificial='yes'/>
     +             <parameter type-id='type-id-1435' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
      +          <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1436' is-artificial='yes'/>
     -             <parameter type-id='type-id-1340'/>
     +             <parameter type-id='type-id-1435' is-artificial='yes'/>
     +             <parameter type-id='type-id-1339'/>
                   <parameter type-id='type-id-4'/>
      @@
                 </function-decl>
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1414' is-artificial='yes'/>
     +             <parameter type-id='type-id-1413' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private'>
      -          <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
      +          <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1415' is-artificial='yes'/>
     +             <parameter type-id='type-id-1414' is-artificial='yes'/>
                   <parameter type-id='type-id-96'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1415' is-artificial='yes'/>
     +             <parameter type-id='type-id-1414' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='protected' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1427' is-artificial='yes'/>
     +             <parameter type-id='type-id-1426' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes' vtable-offset='-1'>
      -          <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-2294' is-artificial='yes'/>
     +             <parameter type-id='type-id-2295' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' constructor='yes'>
      -          <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC1ERKSs@@GLIBCXX_3.4'>
      +          <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC2ERKSs@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-2296' is-artificial='yes'/>
     +             <parameter type-id='type-id-2297' is-artificial='yes'/>
                   <parameter type-id='type-id-357'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
               <member-function access='private' destructor='yes'>
      -          <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED1Ev@@GLIBCXX_3.4'>
      +          <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED2Ev@@GLIBCXX_3.4'>
     -             <parameter type-id='type-id-1332' is-artificial='yes'/>
     +             <parameter type-id='type-id-1331' is-artificial='yes'/>
                   <parameter type-id='type-id-6' is-artificial='yes'/>
                   <return type-id='type-id-5'/>
      @@
     @@ tests/data/test-read-dwarf/test3.so.abi
      +    <elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' 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'>
      +    <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'>
     @@ tests/data/test-read-dwarf/test3.so.hash.abi
      +    <elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' 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'>
      +    <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'>
14:  f328cdab60d9 ! 15:  1b99c3a83176 dwarf-reader/writer: consider aliases when dealing with suppressions
     @@ Metadata
       ## Commit message ##
          dwarf-reader/writer: consider aliases when dealing with suppressions
      
     -    When a symbol is suppressed and it happens to be the main symbol of a
     -    group of aliased symbols where another symbol is not suppressed, the
     -    dwarf reader discards the DWARF information upon reading and the writer
     -    will not be able to connect dwarf information to the aliased elf symbol.
     +    When the symbol of a decl is suppressed and it happens to be the main
     +    symbol of a group of aliased symbols where another symbol is not
     +    suppressed, the dwarf reader discards the decl from the internal
     +    representation altogether upon reading and thus the writer will not be
     +    able to connect that decl to the non-suppressed aliased elf symbol.
      
     -    In order to address this, ensure we are not suppressing symbols
     -    (actually functions and variables) for which an alias is not suppressed.
     -    We therefore keep the DWARF information even if only a non-main symbol
     -    is asked for.
     +    In order to address this, ensure we are not suppressing decls for which
     +    an alias is not suppressed. We therefore keep the decl in the IR when at
     +    least one its underlying aliased symbols is non-suppressed.
      
          Likewise, when the abg-writer is having to attach an elf-symbol-id to
     -    the DWARF collected information (for functions and variables), instead
     -    of omitting the symbol altogether, rather make use of the property of
     -    aliases and connect the dwarf information to an alias instead. This way
     -    the function dwarf information stays connected to the elf symbol that we
     -    want to track.
     +    the decl, instead of omitting the symbol altogether, rather make use of
     +    the property of aliases and connect the dwarf information to an alias
     +    instead. This way the function dwarf information stays connected to the
     +    elf symbol that we want to track.
      
          When reading from XML with a symbol whitelist that leads to suppression
          of aliased symbols, abidiff would hit an assertion and crash when
     @@ Commit message
                  * tests/test-read-dwarf.cc: Add new test cases.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-dwarf-reader.cc ##
     @@ tests/data/test-read-dwarf/test-suppressed-alias.o (new)
      
       ## tests/data/test-read-dwarf/test-suppressed-alias.o.abi (new) ##
      @@
     -+<abi-corpus path='data/test-read-dwarf/test-suppressed-alias.o'>
     ++<abi-corpus version='2.0' path='data/test-read-dwarf/test-suppressed-alias.o'>
      +  <elf-function-symbols>
      +    <elf-symbol name='alias_func' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
      +  </elf-function-symbols>
      +  <elf-variable-symbols>
      +    <elf-symbol name='alias_var' size='4' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
      +  </elf-variable-symbols>
     -+  <abi-instr version='1.0' address-size='64' path='test.c' comp-dir-path='/ws/android/aosp/kernel-build-tools/external/libabigail' language='LANG_C99'>
     ++  <abi-instr address-size='64' path='test.c' comp-dir-path='/ws/android/aosp/kernel-build-tools/external/libabigail' language='LANG_C99'>
      +    <type-decl name='int' size-in-bits='32' id='95e97e5e'/>
      +    <type-decl name='void' id='48b5725f'/>
      +    <var-decl name='main_var' type-id='95e97e5e' mangled-name='main_var' visibility='default' filepath='/ws/android/aosp/kernel-build-tools/external/libabigail/test.c' line='14' column='1' elf-symbol-id='alias_var'/>
     @@ tests/data/test-read-dwarf/test-suppressed-alias.suppr (new)
      
       ## tests/data/test-read-dwarf/test3-alias-1.so.hash.abi (new) ##
      @@
     -+<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>
      +  <elf-function-symbols>
      +    <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='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'/>
     @@ tests/data/test-read-dwarf/test3-alias-1.suppr (new)
      
       ## tests/data/test-read-dwarf/test3-alias-2.so.hash.abi (new) ##
      @@
     -+<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>
     @@ tests/data/test-read-dwarf/test3-alias-2.so.hash.abi (new)
      +    <elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' 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'/>
     @@ tests/data/test-read-dwarf/test3-alias-2.suppr (new)
      
       ## tests/data/test-read-dwarf/test3-alias-3.so.hash.abi (new) ##
      @@
     -+<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>
      +  <elf-function-symbols>
      +    <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'/>
     @@ tests/data/test-read-dwarf/test3-alias-3.suppr (new)
      
       ## tests/data/test-read-dwarf/test3-alias-4.so.hash.abi (new) ##
      @@
     -+<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>
15:  da602c769e8f ! 16:  61f3486a7623 abg-writer.cc: fix write_elf_symbol_reference loop
     @@ Commit message
      
          Fixes: commmit ("dwarf-reader/writer: consider aliases when dealing with suppressions")
          Signed-off-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## src/abg-writer.cc ##
16:  9557767144f9 ! 17:  764897310058 symtab: Add support for MODVERSIONS (CRC checksums)
     @@ Commit message
                  * tests/test-symtab.cc (Symtab::KernelSymtabsWithCRC): New test case.
      
          Reviewed-by: Giuliano Procida <gprocida@google.com>
     +    Reviewed-by: Dodji Seketeli <dodji@seketeli.org>
          Signed-off-by: Matthias Maennich <maennich@google.com>
      
       ## include/abg-ir.h ##
     @@ src/abg-ir.cc: struct elf_symbol::priv
             is_suppressed_(is_suppressed)
         {
           if (!is_common_)
     +@@ src/abg-ir.cc: elf_symbol::elf_symbol()
     + ///
     + /// @param is_linux_string_cst true if the symbol is a Linux Kernel
     + /// string constant defined in the __ksymtab_strings section.
     ++///
     ++/// @param crc the CRC (modversions) value of Linux Kernel symbols
     + elf_symbol::elf_symbol(const environment* e,
     + 		       size_t		  i,
     + 		       size_t		  s,
      @@ src/abg-ir.cc: elf_symbol::elf_symbol(const environment* e,
       		       visibility	  vi,
       		       bool		  is_linux_string_cst,
     @@ src/abg-ir.cc: elf_symbol::elf_symbol(const environment* e,
       		   is_suppressed))
       {}
       
     +@@ src/abg-ir.cc: elf_symbol::create()
     + /// @param is_linux_string_cst if true, it means the symbol represents
     + /// a string constant from a linux kernel binary.
     + ///
     ++/// @param crc the CRC (modversions) value of Linux Kernel symbols
     ++///
     + /// @return a (smart) pointer to a newly created instance of @ref
     + /// elf_symbol.
     + elf_symbol_sptr
      @@ src/abg-ir.cc: elf_symbol::create(const environment* e,
       		   visibility	      vi,
       		   bool		      is_linux_string_cst,
     @@ src/abg-ir.cc: void
       elf_symbol::set_is_in_ksymtab(bool is_in_ksymtab)
       {priv_->is_in_ksymtab_ = is_in_ksymtab;}
       
     ++/// Getter of the 'crc' property.
     ++///
     ++/// @return the CRC (modversions) value for Linux Kernel symbols (if present)
      +uint64_t
      +elf_symbol::get_crc() const
      +{return priv_->crc_;}
      +
     ++/// Setter of the 'crc' property.
     ++///
     ++/// @param crc the new CRC (modversions) value for Linux Kernel symbols
      +void
      +elf_symbol::set_crc(uint64_t crc)
      +{priv_->crc_ = crc;}
      +
     - bool
     - elf_symbol::is_suppressed() const
     - {return priv_->is_suppressed_;}
     + /// Getter for the 'is-suppressed' property.
     + ///
     + /// @return true iff the current symbol has been suppressed by a
      
       ## src/abg-reader.cc ##
      @@ src/abg-reader.cc: build_elf_symbol(read_context& ctxt, const xmlNodePtr node,
     @@ src/abg-symtab-reader.cc: symtab::load_(Elf*	       elf_handle,
         std::unordered_set<std::string> exported_kernel_symbols;
      +  std::unordered_map<std::string, uint64_t> crc_values;
       
     +   const bool is_arm32 = elf_helpers::architecture_is_arm32(elf_handle);
         const bool is_ppc64 = elf_helpers::architecture_is_ppc64(elf_handle);
     - 
      @@ src/abg-symtab-reader.cc: symtab::load_(Elf*	       elf_handle,
       	  ABG_ASSERT(exported_kernel_symbols.insert(name.substr(10)).second);
       	  continue;
     @@ src/abg-symtab-reader.cc: symtab::load_(Elf*	       elf_handle,
      +      if (r == name_symbol_map_.end())
      +	continue;
      +
     -+      for (const auto& symbol : r->second) {
     ++      for (const auto& symbol : r->second)
      +	symbol->set_crc(crc_entry.second);
     -+      }
      +    }
      +
         // sort the symbols for deterministic output
     @@ tests/data/test-abidiff/test-empty-corpus-report.txt (deleted)
      
       ## tests/data/test-read-dwarf/PR25007-sdhci.ko.abi ##
      @@
     - <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'/>
     @@ tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
      +    <elf-symbol name='sdhci_start_tuning' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x39f40b95'/>
      +    <elf-symbol name='sdhci_suspend_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa6de7a42'/>
         </elf-function-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'/>
      
       ## tests/data/test-read-write/test-crc.xml (new) ##
      @@
     -+<abi-corpus path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
     ++<abi-corpus version='2.0' path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
      +  <elf-function-symbols>
      +    <elf-symbol name='exported_function' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe52d5bcf'/>
      +    <elf-symbol name='exported_function_gpl' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfda43846'/>

Comments

Dodji Seketeli April 2, 2021, 2:28 p.m. UTC | #1
Hello Matthias,

Matthias Maennich <maennich@google.com> a écrit:

[...]


> please pull:
>
> The following changes since commit 2eefd1727663285fe3544c41ec01dea32b2ec7dd:
>
>   Bug 27569 - abidiff misses a function parameter addition (2021-03-29 12:34:48 +0200)
>
> are available in the Git repository at:
>
>   ssh://sourceware.org/git/libabigail.git mm-symtab-reader
>
> for you to fetch changes up to 6be21667a07e261dc9779271048c219232c1b911:
>
>   symtab: Add support for MODVERSIONS (CRC checksums) (2021-03-29
>   13:39:56 +0100)

Applied to master.

Thanks!

Cheers,