public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 2/2 v2] Tag add/remove/change lines unconditionally with [A], [D], [C].
  2020-01-01  0:00 ` [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C] Giuliano Procida via libabigail
  2020-01-01  0:00   ` Dodji Seketeli
@ 2020-01-01  0:00   ` Giuliano Procida via libabigail
  2020-03-17 13:19     ` [PATCH 2/2 v3] " Giuliano Procida
  1 sibling, 1 reply; 7+ messages in thread
From: Giuliano Procida via libabigail @ 2020-01-01  0:00 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida

These tags were previously only emitted by the default reporter if the
there were more than 100 (hard-coded constant) items in a a list. The
leaf reporter emitted them unconditionally. This change simplifies the
code, makes output more consistent and makes it easier to interpret
diffs of diff output.

Additionally, the reporting of changed unreachable types was wrong.
The indentation and quoting (used for the deleted and added cases) was
missing. This patch fixes this.

Finally, when doing package differences, there were no tags for
deleted/added binaries. This patch adds this.

	* src/abg-default-reporter.cc (report): In the corpus_diff
	override, remove calculations of number of changes (total) and
	arbitrary threshold (large_num) and emit tags unconditionally.
	* src/abg-reporter-priv.cc
	(maybe_report_unreachable_type_changes): Remove arbitrary
	threshold (large_num) and emit tags unconditionally; fix
	indentation and quotation of changed unreachable types.
	* tests/data/test-*/*report*.txt: Add tags to reports.
	* tools/abipkgdiff.cc (compare_prepared_userspace_packages):
	Emit [D] and [A] tags for removed and added binaries.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-default-reporter.cc                   |  38 +--
 src/abg-reporter-priv.cc                      |  18 +-
 .../test1-fn-removed-report-0.txt             |   2 +-
 .../test2-var-removed-report-0.txt            |   2 +-
 .../test3-fn-removed-report-0.txt             |   2 +-
 .../test2-filtered-removed-fns-report0.txt    |   2 +-
 .../test-abidiff/test-PR18791-report0.txt     |   4 +-
 .../PR25058-liblttng-ctl-report-1.txt         |   6 +-
 tests/data/test-diff-dwarf/test0-report.txt   |   2 +-
 .../test16-syms-only-report.txt               |   2 +-
 .../test17-non-refed-syms-report-0.txt        |   2 +-
 .../test18-alias-sym-report-0.txt             |   2 +-
 .../test19-soname-report-0.txt                |   2 +-
 .../test28-vtable-changes-report-0.txt        |  10 +-
 .../test29-vtable-changes-report-0.txt        |   2 +-
 .../test30-vtable-changes-report-0.txt        |   2 +-
 .../test31-vtable-changes-report-0.txt        |   2 +-
 .../test32-fnptr-changes-report-0.txt         |   4 +-
 .../test33-fnref-changes-report-0.txt         |   4 +-
 .../test42-PR21296-clanggcc-report0.txt       |   2 +-
 tests/data/test-diff-dwarf/test7-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test9-report.txt   |   2 +-
 tests/data/test-diff-filter/test0-report.txt  |   2 +-
 tests/data/test-diff-filter/test01-report.txt |   2 +-
 tests/data/test-diff-filter/test10-report.txt |   4 +-
 tests/data/test-diff-filter/test12-report.txt |   2 +-
 tests/data/test-diff-filter/test13-report.txt |   2 +-
 tests/data/test-diff-filter/test2-report.txt  |   2 +-
 .../test30-pr18904-rvalueref-report0.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report1.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report2.txt      | 282 +++++++++---------
 .../test31-pr18535-libstdc++-report-0.txt     |  38 +--
 .../test31-pr18535-libstdc++-report-1.txt     |  38 +--
 .../test35-pr18754-no-added-syms-report-0.txt | 272 ++++++++---------
 .../test35-pr18754-no-added-syms-report-1.txt | 178 +++++------
 .../data/test-diff-filter/test41-report-0.txt |  50 ++--
 tests/data/test-diff-filter/test9-report.txt  |   4 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  24 +-
 .../PR24690/PR24690-report-0.txt              |  46 +--
 ...bus-glib-0.104-3.fc23.armv7hl-report-0.txt |  18 +-
 ....el7.x86_64-multiple-sym-vers-report-0.txt |   8 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |   8 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |   4 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |   4 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |   2 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-0.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-1.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |  18 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt | 124 ++++----
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt | 124 ++++----
 .../data/test-diff-pkg/test-rpm-report-0.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-1.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-2.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-3.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-5.txt  |   4 +-
 .../test15-suppr-added-fn-report-0.txt        |   2 +-
 .../test15-suppr-added-fn-report-2.txt        |   2 +-
 .../test15-suppr-added-fn-report-5.txt        |   2 +-
 .../test16-suppr-removed-fn-report-0.txt      |   2 +-
 .../test16-suppr-removed-fn-report-3.txt      |   2 +-
 .../test16-suppr-removed-fn-report-5.txt      |   2 +-
 .../test17-suppr-added-var-report-0.txt       |   2 +-
 .../test17-suppr-added-var-report-3.txt       |   2 +-
 .../test17-suppr-added-var-report-5.txt       |   2 +-
 .../test18-suppr-removed-var-report-0.txt     |   2 +-
 .../test18-suppr-removed-var-report-3.txt     |   2 +-
 .../test18-suppr-removed-var-report-5.txt     |   2 +-
 .../test19-suppr-added-fn-sym-report-0.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-3.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-5.txt    |   2 +-
 .../test20-suppr-removed-fn-sym-report-0.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-1.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-2.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-3.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-4.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-5.txt  |   6 +-
 .../test21-suppr-added-var-sym-report-0.txt   |   4 +-
 .../test21-suppr-added-var-sym-report-1.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-2.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-3.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-4.txt   |   2 +-
 .../test22-suppr-removed-var-sym-report-0.txt |   6 +-
 .../test22-suppr-removed-var-sym-report-1.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-2.txt |   2 +-
 .../test22-suppr-removed-var-sym-report-3.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-4.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-5.txt |   2 +-
 .../test27-add-aliased-function-report-0.txt  |   2 +-
 .../test27-add-aliased-function-report-3.txt  |   2 +-
 .../test27-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-0.txt  |   2 +-
 .../test28-add-aliased-function-report-1.txt  |   2 +-
 .../test28-add-aliased-function-report-2.txt  |   2 +-
 .../test28-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-5.txt  |   2 +-
 .../data/test-diff-suppr/test30-report-0.txt  |   4 +-
 ...t44-suppr-sym-name-not-regexp-report-1.txt |   4 +-
 .../test47-non-reachable-types-report-1.txt   |   6 +-
 .../test47-non-reachable-types-report-2.txt   |   4 +-
 .../test47-non-reachable-types-report-3.txt   |   4 +-
 .../test47-non-reachable-types-report-4.txt   |   4 +-
 .../test47-non-reachable-types-report-7.txt   |   6 +-
 ...0-from-fc20-to-fc23-dbus-glib-report-0.txt |  22 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ....fc20--dbus-glib-0.106-1.fc23-report-0.txt |  22 +-
 ...--dbus-glib-0.106-1.fc23.i686-report-0.txt |  14 +-
 ...-glib-0.106-1.fc23.x86_64.rpm-report-0.txt |   8 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ...s-util-3.24.0-2.0.fc25.x86_64-report-0.txt |  74 ++---
 ...-vte291-0.39.90-1.fc22.x86_64-report-0.txt |   8 +-
 tools/abipkgdiff.cc                           |   4 +-
 112 files changed, 1177 insertions(+), 1203 deletions(-)

diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index aaf083b3..70ad8da8 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1761,21 +1761,17 @@ void
 default_reporter::report(const corpus_diff& d, ostream& out,
 			 const string& indent) const
 {
-  size_t total = 0, removed = 0, added = 0;
+  size_t removed = 0, added = 0;
   const corpus_diff::diff_stats &s =
     const_cast<corpus_diff&>(d).
     apply_filters_and_suppressions_before_reporting();
 
   const diff_context_sptr& ctxt = d.context();
 
-  /// Report removed/added/changed functions.
-  total = s.net_num_func_removed() + s.net_num_func_added() +
-    s.net_num_func_changed();
-  const unsigned large_num = 100;
-
   d.priv_->emit_diff_stats(s, out, indent);
   if (ctxt->show_stats_only())
     return;
+
   out << "\n";
 
   if (ctxt->show_soname_change()
@@ -1790,6 +1786,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	<< d.first_corpus()->get_architecture_name() << "' to '"
 	<< d.second_corpus()->get_architecture_name() << "'\n\n";
 
+  /// Report removed/added/changed functions.
   if (ctxt->show_deleted_fns())
     {
       if (s.net_num_func_removed() == 1)
@@ -1809,8 +1806,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'" << (*i)->get_pretty_representation() << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -1855,8 +1851,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  out
 	    << indent
 	    << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'"
 	      << (*i)->get_pretty_representation()
 	      << "'";
@@ -1973,10 +1968,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	}
     }
 
-  // Report added/removed/changed variables.
-  total = s.num_vars_removed() + s.num_vars_added() +
-    s.num_vars_changed() - s.num_changed_vars_filtered_out();
-
+  // Report removed/added/changed variables.
   if (ctxt->show_deleted_vars())
     {
       if (s.net_num_vars_removed() == 1)
@@ -1999,8 +1991,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'"
 	      << n
 	      << "'";
@@ -2043,8 +2034,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'" << n << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -2126,8 +2116,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_removed_func_syms() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.first_corpus()->get_fun_symbol_map());
@@ -2162,8 +2151,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_func_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "",
 					**i,
 					d.second_corpus()->get_fun_symbol_map());
@@ -2197,8 +2185,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.num_var_syms_removed() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases
 	    (out, "", **i,
@@ -2235,8 +2222,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_var_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.second_corpus()->get_fun_symbol_map());
 	  out << "\n";
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index fbac85f8..be100fd9 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -1237,7 +1237,6 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
 				      const string& indent,
 				      ostream& out)
 {
-  const unsigned large_num = 100;
   const diff_context_sptr& ctxt = d.context();
 
   if (!(ctxt->show_unreachable_types()
@@ -1269,10 +1268,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
       if (d.priv_->deleted_unreachable_type_is_suppressed((*i).get()))
 	continue;
 
-      out << indent << "  ";
-      if (s.num_removed_unreachable_types() > large_num)
-	out << "[D] ";
-      out << get_pretty_representation(*i);
+      out << indent << "  [D] '" << get_pretty_representation(*i) << "'";
       report_loc_info(*i, *ctxt, out);
       out << "\n";
       emitted = true;
@@ -1306,12 +1302,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
 
       string repr = diff->first_subject()->get_pretty_representation();
 
-      out << "  ";
-
-      if (sorted_diff_sptrs.size() > large_num)
-	out << "[C] ";
-
-      out << "'" << repr << "' changed:\n";
+      out << indent << "  [C] '" << repr << "' changed:\n";
       diff->report(out, indent + "    ");
       out << "\n";
       emitted = true;
@@ -1343,10 +1334,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
       if (d.priv_->added_unreachable_type_is_suppressed((*i).get()))
 	continue;
 
-      out << indent << "  ";
-      if (s.num_added_unreachable_types() > large_num)
-	out << "[A] ";
-      out << "'" << get_pretty_representation(*i) << "'";
+      out << indent << "  [A] '" << get_pretty_representation(*i) << "'";
       report_loc_info(*i, *ctxt, out);
       out << "\n";
       emitted = true;
diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
index acc1584a..6c78819d 100644
--- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
@@ -4,6 +4,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fun2()'    {_Z4fun2v}
+  [D] 'function void fun2()'    {_Z4fun2v}
 
 
diff --git a/tests/data/test-abicompat/test2-var-removed-report-0.txt b/tests/data/test-abicompat/test2-var-removed-report-0.txt
index c407f2d1..eba61773 100644
--- a/tests/data/test-abicompat/test2-var-removed-report-0.txt
+++ b/tests/data/test-abicompat/test2-var-removed-report-0.txt
@@ -4,5 +4,5 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed variable:
 
-  'int global_var1'    {global_var1}
+  [D] 'int global_var1'    {global_var1}
 
diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
index ba05d574..a74b5fc8 100644
--- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
@@ -4,6 +4,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
+  [D] 'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
 
 
diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
index 9ae258c9..88affc68 100644
--- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
+++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void to_erase()'    {to_erase}
+  [D] 'function void to_erase()'    {to_erase}
 
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index e24ce778..50361fa7 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 1 Added function:
 
-  'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 17 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index 29f823ec..d541f73b 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -357,7 +357,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 3 Added variables:
 
-  'const char* const mi_lttng_element_command_disable_rotation'
-  'const char* const mi_lttng_element_command_enable_rotation'
-  'const char* const mi_lttng_element_command_rotate'
+  [A] 'const char* const mi_lttng_element_command_disable_rotation'
+  [A] 'const char* const mi_lttng_element_command_enable_rotation'
+  [A] 'const char* const mi_lttng_element_command_rotate'
 
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 24d5e022..ab7ac3ea 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test16-syms-only-report.txt b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-dwarf/test16-syms-only-report.txt
+++ b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
index 0ec84a24..f87f7a23 100644
--- a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  bar
+  [A] bar
 
diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
index b3eb66d2..9683d745 100644
--- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
+++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'
+  [A] 'function void bar()'
 
diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
index aed9009f..45df5856 100644
--- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt
+++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
@@ -6,5 +6,5 @@ SONAME changed from 'libtest19-soname-0' to 'libtest19-soname-1'
 
 1 Added function:
 
-  'function void func1()'
+  [A] 'function void func1()'
 
diff --git a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
index 361781a1..6f015fc8 100644
--- a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 2 Added functions:
 
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
@@ -19,7 +19,7 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 3 Added variable symbols not referenced by debug info:
 
-  _ZTI1S
-  _ZTS1S
-  _ZTV1S
+  [A] _ZTI1S
+  [A] _ZTS1S
+  [A] _ZTV1S
 
diff --git a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
index fc80348a..423ddbee 100644
--- a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fn1()'
+  [A] 'method virtual void S::fn1()'
     note that this adds a new entry to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
index 6b0f772c..4153952e 100644
--- a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fvtable_breaker()'
+  [A] 'method virtual void S::fvtable_breaker()'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
index 23e6fb52..4e1a3eda 100644
--- a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual void S::fn0()'
+  [D] 'method virtual void S::fn0()'
     note that this removes an entry from the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 1dd410ca..f7c79fc2 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(callback)'
+  [D] 'function void fn2(callback)'
 
 1 Added function:
 
-  'function void fn2(callback)'
+  [A] 'function void fn2(callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index 46e71c78..0376981d 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(const callback)'
+  [D] 'function void fn2(const callback)'
 
 1 Added function:
 
-  'function void fn2(const callback)'
+  [A] 'function void fn2(const callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
index 52692d9f..6a262efe 100644
--- a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
+++ b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
+  [D] 'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
 
 11 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test7-report.txt b/tests/data/test-diff-dwarf/test7-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-dwarf/test7-report.txt
+++ b/tests/data/test-diff-dwarf/test7-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 5adaea5f..6341603a 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 914841bd..4588144f 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'unsigned int global_var2'
+  [A] 'unsigned int global_var2'
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 0d5d2e52..384f8eb7 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index 0407bd46..11822134 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index 64969890..6edda6bc 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Removed functions:
 
-  'method S::S()'
-  'method int S::mem_fn2()'
+  [D] 'method S::S()'
+  [D] 'method int S::mem_fn2()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test12-report.txt b/tests/data/test-diff-filter/test12-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-filter/test12-report.txt
+++ b/tests/data/test-diff-filter/test12-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 169771ec..a087f44c 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index 87ef1a4d..af3e9fb5 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method C0::C0()'
+  [A] 'method C0::C0()'
 
 2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index b78215b0..bebd2645 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index ccaf8126..88ee345d 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 44e78935..f6e95c45 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index 795410dc..3313fba3 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 4ec08fea..43a8800f 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index c9cb9246..4bc8bec4 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 6 functions with some indirect sub-type change:
 
@@ -370,53 +370,53 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 1 Changed variable:
 
@@ -430,11 +430,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 2f07f1a6..88a9d3a2 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 1 Changed variable:
 
@@ -100,11 +100,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index cdae9c56..ffa17955 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -5,34 +5,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 8 Removed functions:
 
-  'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
-  'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
-  'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
-  'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
-  'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
+  [D] 'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
+  [D] 'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
+  [D] 'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
+  [D] 'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
+  [D] 'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
 
 16 Added functions:
 
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
-  'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
-  'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
-  'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
-  'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
-  'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
-  'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
-  'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
-  'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
+  [A] 'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
+  [A] 'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
+  [A] 'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
+  [A] 'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
+  [A] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
+  [A] 'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
+  [A] 'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
     note that this adds a new entry to the vtable of class std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>
-  'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
+  [A] 'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
 
 2 functions with some indirect sub-type change:
 
@@ -53,5 +53,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _ZN7abigail10xml_writer13write_contextD1Ev
+  [D] _ZN7abigail10xml_writer13write_contextD1Ev
 
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index 0699c146..0787f566 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Added functions:
 
-  'method S::S()'
-  'method int S::mem_fn1()'
+  [A] 'method S::S()'
+  [A] 'method int S::mem_fn1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index fb67e43a..d120cb9e 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -47,21 +47,21 @@
 
   6 Removed variable symbols not referenced by debug info:
 
-    gtk__glarea__C210s
-    gtk__glarea__gtk_glarea_recordB43s
-    gtk__glarea__gtk_glarea_recordE39s
-    gtk__glarea__gtk_glarea_recordH40s
-    gtk__glarea__gtk_glarea_recordR41s
-    gtk__glarea__gtk_glarea_recordR41s___UNC
+    [D] gtk__glarea__C210s
+    [D] gtk__glarea__gtk_glarea_recordB43s
+    [D] gtk__glarea__gtk_glarea_recordE39s
+    [D] gtk__glarea__gtk_glarea_recordH40s
+    [D] gtk__glarea__gtk_glarea_recordR41s
+    [D] gtk__glarea__gtk_glarea_recordR41s___UNC
 
   6 Added variable symbols not referenced by debug info:
 
-    gtk__glarea__C208s
-    gtk__glarea__gtk_glarea_recordB41s
-    gtk__glarea__gtk_glarea_recordE37s
-    gtk__glarea__gtk_glarea_recordH38s
-    gtk__glarea__gtk_glarea_recordR39s
-    gtk__glarea__gtk_glarea_recordR39s___UNC
+    [A] gtk__glarea__C208s
+    [A] gtk__glarea__gtk_glarea_recordB41s
+    [A] gtk__glarea__gtk_glarea_recordE37s
+    [A] gtk__glarea__gtk_glarea_recordH38s
+    [A] gtk__glarea__gtk_glarea_recordR39s
+    [A] gtk__glarea__gtk_glarea_recordR39s___UNC
 
 ================ end of changes of 'libgtkada_gl-2.24.so.2'===============
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index d106bf9b..e717488c 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -5,32 +5,32 @@
 
   16 Added functions:
 
-    'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
-    'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
-    'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
-    'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
-    'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
-    'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
-    'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
-    'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
-    'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
-    'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
-    'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
-    'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
-    'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
-    'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
-    'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
-    'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
+    [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
+    [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
+    [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
+    [A] 'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
+    [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
+    [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
+    [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
+    [A] 'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
+    [A] 'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
+    [A] 'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
+    [A] 'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
+    [A] 'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
+    [A] 'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
+    [A] 'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
+    [A] 'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
+    [A] 'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
 
   3 removed types unreachable from any public interface:
 
-    struct _GUnixFDList at gunixfdlist.h:58:1
-    typedef GUnixFDList at giotypes.h:549:1
-    typedef GUnixFDListPrivate at gunixfdlist.h:41:1
+    [D] 'struct _GUnixFDList' at gunixfdlist.h:58:1
+    [D] 'typedef GUnixFDList' at giotypes.h:549:1
+    [D] 'typedef GUnixFDListPrivate' at gunixfdlist.h:41:1
 
   1 changed type unreachable from any public interface:
 
-  'struct _FlatpakTransactionClass' changed:
+    [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
         'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* _FlatpakTransactionClass::end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
@@ -43,9 +43,9 @@
 
   3 added types unreachable from any public interface:
 
-    'struct gpgme_data_cbs' at gpgme-64.h:1139:1
-    'typedef GSubprocess' at giotypes.h:642:1
-    'typedef OstreeRepoResolveRevExtFlags' at ostree-repo.h:473:1
+    [A] 'struct gpgme_data_cbs' at gpgme-64.h:1139:1
+    [A] 'typedef GSubprocess' at giotypes.h:642:1
+    [A] 'typedef OstreeRepoResolveRevExtFlags' at ostree-repo.h:473:1
 
 ================ end of changes of 'libflatpak.so.0.10204.0'===============
 
diff --git a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
index 383f8dd2..acc301fd 100644
--- a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
+++ b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
@@ -9,20 +9,20 @@
 
   5 Added function symbols not referenced by debug info:
 
-    __libc_csu_fini
-    __libc_csu_init
-    base_info_ref
-    base_info_unref
-    main
+    [A] __libc_csu_fini
+    [A] __libc_csu_init
+    [A] base_info_ref
+    [A] base_info_unref
+    [A] main
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
 Removed binaries:
-  /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [D] /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
 Added binaries:
-  /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [A] /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
diff --git a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
index 37e6b486..9d1f078d 100644
--- a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
+++ b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
@@ -4,10 +4,10 @@
 
   4 Added functions:
 
-    'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
-    'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
-    'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
-    'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
+    [A] 'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
+    [A] 'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
+    [A] 'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
+    [A] 'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
 
 ================ end of changes of 'libdw-0.170.so'===============
 
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index 0c097b6b..46581156 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -4,9 +4,9 @@
 
   3 Added functions:
 
-    'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
-    'function int _IceTransListen(const char*)'    {_IceTransListen}
-    'function int _IceTransReceived(const char*)'    {_IceTransReceived}
+    [A] 'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
+    [A] 'function int _IceTransListen(const char*)'    {_IceTransListen}
+    [A] 'function int _IceTransReceived(const char*)'    {_IceTransReceived}
 
   1 function with some indirect sub-type change:
 
@@ -88,7 +88,7 @@
 
   1 Removed variable:
 
-    'const in6_addr in6addr_any'    {in6addr_any}
+    [D] 'const in6_addr in6addr_any'    {in6addr_any}
 
   2 Changed variables:
 
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index b3be1535..b9d9d4d9 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -46,11 +46,11 @@
 
   1 Removed function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
+    [D] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
 
   1 Added function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
+    [A] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
 
 
 ================ end of changes of 'libiso9660++.so.0.0.0'===============
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 3819aed9..34514ee2 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -4,11 +4,11 @@
 
   1 Removed function:
 
-    'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
+    [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
 
   1 Added function:
 
-    'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
+    [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index c227fa5c..6cba71de 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -24,7 +24,7 @@
 
   1 Added function:
 
-    'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
+    [A] 'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
index 9251c43f..545f4947 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
index 9251c43f..545f4947 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index b885629e..28c7185a 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   6 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index 69f438ea..0d78f820 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   8 functions with some indirect sub-type change:
 
@@ -231,9 +231,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -245,46 +245,46 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -294,15 +294,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index de74f1c5..ce886ce9 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   7 functions with some indirect sub-type change:
 
@@ -87,9 +87,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -101,46 +101,46 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -150,15 +150,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
diff --git a/tests/data/test-diff-pkg/test-rpm-report-0.txt b/tests/data/test-diff-pkg/test-rpm-report-0.txt
index 3fb8b8cc..5c5298a5 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-0.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,13 +25,13 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-1.txt b/tests/data/test-diff-pkg/test-rpm-report-1.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-1.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-1.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-2.txt b/tests/data/test-diff-pkg/test-rpm-report-2.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-2.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-2.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-3.txt b/tests/data/test-diff-pkg/test-rpm-report-3.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-3.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-3.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-5.txt b/tests/data/test-diff-pkg/test-rpm-report-5.txt
index a1015ef8..5095eb76 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-5.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-5.txt
@@ -5,8 +5,8 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
index a0cb5cf7..0ab050b2 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index e64a5b55..63792b6b 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
index 1d859f62..65fb16cb 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index 80012c1e..e12412dc 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index fa1d882f..f4be96f4 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
index 8aab663e..d1e246cf 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed (1 filtered out), 1 Added variab
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index fa1d882f..f4be96f4 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index 47fe3d83..70ff9319 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
index be6bc1ed..2ebce7a5 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 1 Removed, 0 Changed (1 filtered out), 0 Added variab
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index 47fe3d83..70ff9319 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
index ad029060..803f2d82 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
@@ -5,6 +5,6 @@ Variable symbols changes summary: 0 Removed, 2 Added variable symbols not refere
 
 2 Added variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [A] global_var1
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
index 1756ef53..779086e5 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 2 Removed, 1 Added variable symbols not refere
 
 2 Removed variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [D] global_var1
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
index 2b4f9883..174f1b93 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
@@ -6,5 +6,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
index e4442c4d..6ec7d542 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var1
+  [D] global_var1
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
index 2b4f9883..174f1b93 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
@@ -6,5 +6,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index be32d3f7..a3b2b4c0 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
+  [D] 'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
     note that this removes an entry from the vtable of class non_defined_class
 
 1 Added function:
 
-  'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
+  [A] 'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
     note that this adds a new entry to the vtable of class non_defined_class
 
 2 functions with some indirect sub-type change:
diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
index b1ba80e8..1b49d600 100644
--- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
+++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
@@ -3,9 +3,9 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void test2()'    {test2}
+  [D] 'function void test2()'    {test2}
 
 1 Removed variable:
 
-  'char test2_variable'    {test2_variable}
+  [D] 'char test2_variable'    {test2_variable}
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
index 5efd5df5..a1b349bb 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
@@ -4,11 +4,11 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -16,5 +16,5 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
index 21005c2a..84c24bc5 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
@@ -4,7 +4,7 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -12,5 +12,5 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
index d0736bf3..15dce83a 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
@@ -4,10 +4,10 @@ Unreachable types summary: 1 removed, 0 changed (1 filtered out), 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
index 1004cdf2..3249a77a 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
@@ -4,11 +4,11 @@ Unreachable types summary: 1 removed, 1 changed, 0 added (1 filtered out) types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
index 51af7fea..7de31388 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
@@ -6,11 +6,11 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -18,5 +18,5 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
index a3241095..40b45b46 100644
--- a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -43,8 +43,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -54,8 +54,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index d774e54d..3d9398ab 100644
--- a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
index a3241095..40b45b46 100644
--- a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -43,8 +43,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -54,8 +54,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
index fc85920c..2fe90725 100644
--- a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
index d774e54d..3d9398ab 100644
--- a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index b3123d3c..63378fd8 100644
--- a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -8,8 +8,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added function symbols not referenced by debug info:
 
-    dbus_g_connection_open_private
-    dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_method_invocation_get_g_connection
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -21,8 +21,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
index b3ee9111..006b334e 100644
--- a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
@@ -8,43 +8,43 @@ Comparing the ABI of binaries between nss-util-3.12.6-1.fc14.x86_64.rpm and nss-
 
   37 Added function symbols not referenced by debug info:
 
-    NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
-    NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
-    NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
-    NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
-    NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
-    NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
-    NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
-    NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
-    NSSUTIL_ArgReadLong@@NSSUTIL_3.14
-    NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
-    NSSUTIL_ArgStrip@@NSSUTIL_3.14
-    NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscape@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
-    NSSUTIL_Escape@@NSSUTIL_3.14
-    NSSUTIL_EscapeSize@@NSSUTIL_3.14
-    NSSUTIL_GetVersion@@NSSUTIL_3.13
-    NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_MkNSSString@@NSSUTIL_3.14
-    NSSUTIL_MkSlotString@@NSSUTIL_3.14
-    NSSUTIL_Quote@@NSSUTIL_3.14
-    NSSUTIL_QuoteSize@@NSSUTIL_3.14
-    NSS_InitializePRErrorTable@@NSSUTIL_3.13
-    PORT_DestroyCheapArena@@NSSUTIL_3.24
-    PORT_InitCheapArena@@NSSUTIL_3.24
-    PORT_RegExpSearch@@NSSUTIL_3.12.7
-    SECITEM_AllocArray@@NSSUTIL_3.15
-    SECITEM_DupArray@@NSSUTIL_3.15
-    SECITEM_FreeArray@@NSSUTIL_3.15
-    SECITEM_ReallocItemV2@@NSSUTIL_3.15
-    SECITEM_ZfreeArray@@NSSUTIL_3.15
-    _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
-    _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
-    _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
+    [A] NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
+    [A] NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgReadLong@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgStrip@@NSSUTIL_3.14
+    [A] NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscape@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_Escape@@NSSUTIL_3.14
+    [A] NSSUTIL_EscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_GetVersion@@NSSUTIL_3.13
+    [A] NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_MkNSSString@@NSSUTIL_3.14
+    [A] NSSUTIL_MkSlotString@@NSSUTIL_3.14
+    [A] NSSUTIL_Quote@@NSSUTIL_3.14
+    [A] NSSUTIL_QuoteSize@@NSSUTIL_3.14
+    [A] NSS_InitializePRErrorTable@@NSSUTIL_3.13
+    [A] PORT_DestroyCheapArena@@NSSUTIL_3.24
+    [A] PORT_InitCheapArena@@NSSUTIL_3.24
+    [A] PORT_RegExpSearch@@NSSUTIL_3.12.7
+    [A] SECITEM_AllocArray@@NSSUTIL_3.15
+    [A] SECITEM_DupArray@@NSSUTIL_3.15
+    [A] SECITEM_FreeArray@@NSSUTIL_3.15
+    [A] SECITEM_ReallocItemV2@@NSSUTIL_3.15
+    [A] SECITEM_ZfreeArray@@NSSUTIL_3.15
+    [A] _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
+    [A] _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
+    [A] _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
 
 ================ end of changes of 'libnssutil3.so'===============
 
diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
index 0a953a63..8e6fdd4e 100644
--- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
@@ -6,9 +6,9 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   3 Added functions:
 
-    'function const char* vte_get_features()'    {vte_get_features}
-    'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
-    'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
+    [A] 'function const char* vte_get_features()'    {vte_get_features}
+    [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
+    [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
 
 ================ end of changes of 'libvte-2.91.so.0.3901.0'===============
 
@@ -20,7 +20,7 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   1 Added variable symbol not referenced by debug info:
 
-    stderr
+    [A] stderr
 
 ================ end of changes of 'gnome-pty-helper'===============
 
diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 87950020..53fc6315 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -2469,7 +2469,7 @@ compare_prepared_userspace_packages(package& first_package,
 	{
 	  string relative_path;
 	  first_package.convert_path_to_relative((*it)->path, relative_path);
-	  cout << "  " << relative_path << ", ";
+	  cout << "  [D] " << relative_path << ", ";
 	  string soname;
 	  get_soname_of_elf_file((*it)->path, soname);
 	  if (!soname.empty())
@@ -2489,7 +2489,7 @@ compare_prepared_userspace_packages(package& first_package,
 	{
 	  string relative_path;
 	  second_package.convert_path_to_relative((*it)->path, relative_path);
-	  cout << "  " << relative_path << ", ";
+	  cout << "  [A] " << relative_path << ", ";
 	  string soname;
 	  get_soname_of_elf_file((*it)->path, soname);
 	  if (!soname.empty())
-- 
2.25.0.265.gbab2e86ba0-goog

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C].
  2020-01-01  0:00 [PATCH 1/2] Add space missing between "[C]" tag and description of changed item Giuliano Procida via libabigail
  2020-01-01  0:00 ` Dodji Seketeli
@ 2020-01-01  0:00 ` Giuliano Procida via libabigail
  2020-01-01  0:00   ` Dodji Seketeli
  2020-01-01  0:00   ` [PATCH 2/2 v2] " Giuliano Procida via libabigail
  1 sibling, 2 replies; 7+ messages in thread
From: Giuliano Procida via libabigail @ 2020-01-01  0:00 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida

These tags were previously only emitted by the default reporter if the
there were more than 100 (hard-coded constant) items in a a list. The
leaf reporter emitted them unconditionally. This change simplifies the
code, makes output more consistent and makes it easier to interpret
diffs of diff output.

	* src/abg-default-reporter.cc (report): Remove calculations of
        number of changes (total) and arbitrary threshold (large_num)
        and emit prefixes ([A], [D], [C]) unconditionally.
        * tests/data/test-*/*report*.txt: Add prefixes to reports.
---
 src/abg-default-reporter.cc                   |  38 +--
 .../test1-fn-removed-report-0.txt             |   2 +-
 .../test2-var-removed-report-0.txt            |   2 +-
 .../test3-fn-removed-report-0.txt             |   2 +-
 .../test2-filtered-removed-fns-report0.txt    |   2 +-
 .../test-abidiff/test-PR18791-report0.txt     |   4 +-
 .../PR25058-liblttng-ctl-report-1.txt         |   6 +-
 tests/data/test-diff-dwarf/test0-report.txt   |   2 +-
 .../test16-syms-only-report.txt               |   2 +-
 .../test17-non-refed-syms-report-0.txt        |   2 +-
 .../test18-alias-sym-report-0.txt             |   2 +-
 .../test19-soname-report-0.txt                |   2 +-
 .../test28-vtable-changes-report-0.txt        |  10 +-
 .../test29-vtable-changes-report-0.txt        |   2 +-
 .../test30-vtable-changes-report-0.txt        |   2 +-
 .../test31-vtable-changes-report-0.txt        |   2 +-
 .../test32-fnptr-changes-report-0.txt         |   4 +-
 .../test33-fnref-changes-report-0.txt         |   4 +-
 .../test42-PR21296-clanggcc-report0.txt       |   2 +-
 tests/data/test-diff-dwarf/test7-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test9-report.txt   |   2 +-
 tests/data/test-diff-filter/test0-report.txt  |   2 +-
 tests/data/test-diff-filter/test01-report.txt |   2 +-
 tests/data/test-diff-filter/test10-report.txt |   4 +-
 tests/data/test-diff-filter/test12-report.txt |   2 +-
 tests/data/test-diff-filter/test13-report.txt |   2 +-
 tests/data/test-diff-filter/test2-report.txt  |   2 +-
 .../test30-pr18904-rvalueref-report0.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report1.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report2.txt      | 282 +++++++++---------
 .../test31-pr18535-libstdc++-report-0.txt     |  38 +--
 .../test31-pr18535-libstdc++-report-1.txt     |  38 +--
 .../test35-pr18754-no-added-syms-report-0.txt | 272 ++++++++---------
 .../test35-pr18754-no-added-syms-report-1.txt | 178 +++++------
 .../data/test-diff-filter/test41-report-0.txt |  50 ++--
 tests/data/test-diff-filter/test9-report.txt  |   4 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  24 +-
 .../PR24690/PR24690-report-0.txt              |  38 +--
 ...bus-glib-0.104-3.fc23.armv7hl-report-0.txt |  18 +-
 ....el7.x86_64-multiple-sym-vers-report-0.txt |   8 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |   8 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |   4 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |   4 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |   2 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-0.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-1.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |  18 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt | 124 ++++----
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt | 124 ++++----
 .../data/test-diff-pkg/test-rpm-report-0.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-1.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-2.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-3.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-5.txt  |   4 +-
 .../test15-suppr-added-fn-report-0.txt        |   2 +-
 .../test15-suppr-added-fn-report-2.txt        |   2 +-
 .../test15-suppr-added-fn-report-5.txt        |   2 +-
 .../test16-suppr-removed-fn-report-0.txt      |   2 +-
 .../test16-suppr-removed-fn-report-3.txt      |   2 +-
 .../test16-suppr-removed-fn-report-5.txt      |   2 +-
 .../test17-suppr-added-var-report-0.txt       |   2 +-
 .../test17-suppr-added-var-report-3.txt       |   2 +-
 .../test17-suppr-added-var-report-5.txt       |   2 +-
 .../test18-suppr-removed-var-report-0.txt     |   2 +-
 .../test18-suppr-removed-var-report-3.txt     |   2 +-
 .../test18-suppr-removed-var-report-5.txt     |   2 +-
 .../test19-suppr-added-fn-sym-report-0.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-3.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-5.txt    |   2 +-
 .../test20-suppr-removed-fn-sym-report-0.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-1.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-2.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-3.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-4.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-5.txt  |   6 +-
 .../test21-suppr-added-var-sym-report-0.txt   |   4 +-
 .../test21-suppr-added-var-sym-report-1.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-2.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-3.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-4.txt   |   2 +-
 .../test22-suppr-removed-var-sym-report-0.txt |   6 +-
 .../test22-suppr-removed-var-sym-report-1.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-2.txt |   2 +-
 .../test22-suppr-removed-var-sym-report-3.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-4.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-5.txt |   2 +-
 .../test27-add-aliased-function-report-0.txt  |   2 +-
 .../test27-add-aliased-function-report-3.txt  |   2 +-
 .../test27-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-0.txt  |   2 +-
 .../test28-add-aliased-function-report-1.txt  |   2 +-
 .../test28-add-aliased-function-report-2.txt  |   2 +-
 .../test28-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-5.txt  |   2 +-
 .../data/test-diff-suppr/test30-report-0.txt  |   4 +-
 ...t44-suppr-sym-name-not-regexp-report-1.txt |   4 +-
 ...0-from-fc20-to-fc23-dbus-glib-report-0.txt |  22 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ....fc20--dbus-glib-0.106-1.fc23-report-0.txt |  22 +-
 ...--dbus-glib-0.106-1.fc23.i686-report-0.txt |  14 +-
 ...-glib-0.106-1.fc23.x86_64.rpm-report-0.txt |   8 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ...s-util-3.24.0-2.0.fc25.x86_64-report-0.txt |  74 ++---
 ...-vte291-0.39.90-1.fc22.x86_64-report-0.txt |   8 +-
 105 files changed, 1156 insertions(+), 1170 deletions(-)

diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index aaf083b3..70ad8da8 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1761,21 +1761,17 @@ void
 default_reporter::report(const corpus_diff& d, ostream& out,
 			 const string& indent) const
 {
-  size_t total = 0, removed = 0, added = 0;
+  size_t removed = 0, added = 0;
   const corpus_diff::diff_stats &s =
     const_cast<corpus_diff&>(d).
     apply_filters_and_suppressions_before_reporting();
 
   const diff_context_sptr& ctxt = d.context();
 
-  /// Report removed/added/changed functions.
-  total = s.net_num_func_removed() + s.net_num_func_added() +
-    s.net_num_func_changed();
-  const unsigned large_num = 100;
-
   d.priv_->emit_diff_stats(s, out, indent);
   if (ctxt->show_stats_only())
     return;
+
   out << "\n";
 
   if (ctxt->show_soname_change()
@@ -1790,6 +1786,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	<< d.first_corpus()->get_architecture_name() << "' to '"
 	<< d.second_corpus()->get_architecture_name() << "'\n\n";
 
+  /// Report removed/added/changed functions.
   if (ctxt->show_deleted_fns())
     {
       if (s.net_num_func_removed() == 1)
@@ -1809,8 +1806,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'" << (*i)->get_pretty_representation() << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -1855,8 +1851,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  out
 	    << indent
 	    << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'"
 	      << (*i)->get_pretty_representation()
 	      << "'";
@@ -1973,10 +1968,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	}
     }
 
-  // Report added/removed/changed variables.
-  total = s.num_vars_removed() + s.num_vars_added() +
-    s.num_vars_changed() - s.num_changed_vars_filtered_out();
-
+  // Report removed/added/changed variables.
   if (ctxt->show_deleted_vars())
     {
       if (s.net_num_vars_removed() == 1)
@@ -1999,8 +1991,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'"
 	      << n
 	      << "'";
@@ -2043,8 +2034,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'" << n << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -2126,8 +2116,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_removed_func_syms() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.first_corpus()->get_fun_symbol_map());
@@ -2162,8 +2151,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_func_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "",
 					**i,
 					d.second_corpus()->get_fun_symbol_map());
@@ -2197,8 +2185,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.num_var_syms_removed() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases
 	    (out, "", **i,
@@ -2235,8 +2222,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_var_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.second_corpus()->get_fun_symbol_map());
 	  out << "\n";
diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
index acc1584a..6c78819d 100644
--- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
@@ -4,6 +4,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fun2()'    {_Z4fun2v}
+  [D] 'function void fun2()'    {_Z4fun2v}
 
 
diff --git a/tests/data/test-abicompat/test2-var-removed-report-0.txt b/tests/data/test-abicompat/test2-var-removed-report-0.txt
index c407f2d1..eba61773 100644
--- a/tests/data/test-abicompat/test2-var-removed-report-0.txt
+++ b/tests/data/test-abicompat/test2-var-removed-report-0.txt
@@ -4,5 +4,5 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed variable:
 
-  'int global_var1'    {global_var1}
+  [D] 'int global_var1'    {global_var1}
 
diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
index ba05d574..a74b5fc8 100644
--- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
@@ -4,6 +4,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
+  [D] 'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
 
 
diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
index 9ae258c9..88affc68 100644
--- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
+++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void to_erase()'    {to_erase}
+  [D] 'function void to_erase()'    {to_erase}
 
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index e24ce778..50361fa7 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 1 Added function:
 
-  'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 17 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index 29f823ec..d541f73b 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -357,7 +357,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 3 Added variables:
 
-  'const char* const mi_lttng_element_command_disable_rotation'
-  'const char* const mi_lttng_element_command_enable_rotation'
-  'const char* const mi_lttng_element_command_rotate'
+  [A] 'const char* const mi_lttng_element_command_disable_rotation'
+  [A] 'const char* const mi_lttng_element_command_enable_rotation'
+  [A] 'const char* const mi_lttng_element_command_rotate'
 
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 24d5e022..ab7ac3ea 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test16-syms-only-report.txt b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-dwarf/test16-syms-only-report.txt
+++ b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
index 0ec84a24..f87f7a23 100644
--- a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  bar
+  [A] bar
 
diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
index b3eb66d2..9683d745 100644
--- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
+++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'
+  [A] 'function void bar()'
 
diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
index aed9009f..45df5856 100644
--- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt
+++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
@@ -6,5 +6,5 @@ SONAME changed from 'libtest19-soname-0' to 'libtest19-soname-1'
 
 1 Added function:
 
-  'function void func1()'
+  [A] 'function void func1()'
 
diff --git a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
index 361781a1..6f015fc8 100644
--- a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 2 Added functions:
 
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
@@ -19,7 +19,7 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 3 Added variable symbols not referenced by debug info:
 
-  _ZTI1S
-  _ZTS1S
-  _ZTV1S
+  [A] _ZTI1S
+  [A] _ZTS1S
+  [A] _ZTV1S
 
diff --git a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
index fc80348a..423ddbee 100644
--- a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fn1()'
+  [A] 'method virtual void S::fn1()'
     note that this adds a new entry to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
index 6b0f772c..4153952e 100644
--- a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fvtable_breaker()'
+  [A] 'method virtual void S::fvtable_breaker()'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
index 23e6fb52..4e1a3eda 100644
--- a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual void S::fn0()'
+  [D] 'method virtual void S::fn0()'
     note that this removes an entry from the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 1dd410ca..f7c79fc2 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(callback)'
+  [D] 'function void fn2(callback)'
 
 1 Added function:
 
-  'function void fn2(callback)'
+  [A] 'function void fn2(callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index 46e71c78..0376981d 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(const callback)'
+  [D] 'function void fn2(const callback)'
 
 1 Added function:
 
-  'function void fn2(const callback)'
+  [A] 'function void fn2(const callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
index 52692d9f..6a262efe 100644
--- a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
+++ b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
+  [D] 'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
 
 11 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test7-report.txt b/tests/data/test-diff-dwarf/test7-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-dwarf/test7-report.txt
+++ b/tests/data/test-diff-dwarf/test7-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 5adaea5f..6341603a 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 914841bd..4588144f 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'unsigned int global_var2'
+  [A] 'unsigned int global_var2'
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 0d5d2e52..384f8eb7 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index 0407bd46..11822134 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index 64969890..6edda6bc 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Removed functions:
 
-  'method S::S()'
-  'method int S::mem_fn2()'
+  [D] 'method S::S()'
+  [D] 'method int S::mem_fn2()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test12-report.txt b/tests/data/test-diff-filter/test12-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-filter/test12-report.txt
+++ b/tests/data/test-diff-filter/test12-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 169771ec..a087f44c 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index 87ef1a4d..af3e9fb5 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method C0::C0()'
+  [A] 'method C0::C0()'
 
 2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index b78215b0..bebd2645 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index ccaf8126..88ee345d 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 44e78935..f6e95c45 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1454,67 +1454,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1528,90 +1528,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index 795410dc..3313fba3 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 4ec08fea..43a8800f 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index c9cb9246..4bc8bec4 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 6 functions with some indirect sub-type change:
 
@@ -370,53 +370,53 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 1 Changed variable:
 
@@ -430,11 +430,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 2f07f1a6..88a9d3a2 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 1 Changed variable:
 
@@ -100,11 +100,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index cdae9c56..ffa17955 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -5,34 +5,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 8 Removed functions:
 
-  'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
-  'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
-  'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
-  'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
-  'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
+  [D] 'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
+  [D] 'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
+  [D] 'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
+  [D] 'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
+  [D] 'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
 
 16 Added functions:
 
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
-  'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
-  'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
-  'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
-  'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
-  'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
-  'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
-  'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
-  'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
+  [A] 'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
+  [A] 'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
+  [A] 'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
+  [A] 'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
+  [A] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
+  [A] 'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
+  [A] 'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
     note that this adds a new entry to the vtable of class std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>
-  'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
+  [A] 'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
 
 2 functions with some indirect sub-type change:
 
@@ -53,5 +53,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _ZN7abigail10xml_writer13write_contextD1Ev
+  [D] _ZN7abigail10xml_writer13write_contextD1Ev
 
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index 0699c146..0787f566 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Added functions:
 
-  'method S::S()'
-  'method int S::mem_fn1()'
+  [A] 'method S::S()'
+  [A] 'method int S::mem_fn1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index fb67e43a..d120cb9e 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -47,21 +47,21 @@
 
   6 Removed variable symbols not referenced by debug info:
 
-    gtk__glarea__C210s
-    gtk__glarea__gtk_glarea_recordB43s
-    gtk__glarea__gtk_glarea_recordE39s
-    gtk__glarea__gtk_glarea_recordH40s
-    gtk__glarea__gtk_glarea_recordR41s
-    gtk__glarea__gtk_glarea_recordR41s___UNC
+    [D] gtk__glarea__C210s
+    [D] gtk__glarea__gtk_glarea_recordB43s
+    [D] gtk__glarea__gtk_glarea_recordE39s
+    [D] gtk__glarea__gtk_glarea_recordH40s
+    [D] gtk__glarea__gtk_glarea_recordR41s
+    [D] gtk__glarea__gtk_glarea_recordR41s___UNC
 
   6 Added variable symbols not referenced by debug info:
 
-    gtk__glarea__C208s
-    gtk__glarea__gtk_glarea_recordB41s
-    gtk__glarea__gtk_glarea_recordE37s
-    gtk__glarea__gtk_glarea_recordH38s
-    gtk__glarea__gtk_glarea_recordR39s
-    gtk__glarea__gtk_glarea_recordR39s___UNC
+    [A] gtk__glarea__C208s
+    [A] gtk__glarea__gtk_glarea_recordB41s
+    [A] gtk__glarea__gtk_glarea_recordE37s
+    [A] gtk__glarea__gtk_glarea_recordH38s
+    [A] gtk__glarea__gtk_glarea_recordR39s
+    [A] gtk__glarea__gtk_glarea_recordR39s___UNC
 
 ================ end of changes of 'libgtkada_gl-2.24.so.2'===============
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index d106bf9b..81986658 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -5,28 +5,28 @@
 
   16 Added functions:
 
-    'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
-    'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
-    'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
-    'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
-    'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
-    'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
-    'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
-    'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
-    'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
-    'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
-    'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
-    'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
-    'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
-    'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
-    'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
-    'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
+    [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
+    [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
+    [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
+    [A] 'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
+    [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
+    [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
+    [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
+    [A] 'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
+    [A] 'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
+    [A] 'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
+    [A] 'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
+    [A] 'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
+    [A] 'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
+    [A] 'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
+    [A] 'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
+    [A] 'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
 
   3 removed types unreachable from any public interface:
 
-    struct _GUnixFDList at gunixfdlist.h:58:1
-    typedef GUnixFDList at giotypes.h:549:1
-    typedef GUnixFDListPrivate at gunixfdlist.h:41:1
+    [A] struct _GUnixFDList at gunixfdlist.h:58:1
+    [A] typedef GUnixFDList at giotypes.h:549:1
+    [A] typedef GUnixFDListPrivate at gunixfdlist.h:41:1
 
   1 changed type unreachable from any public interface:
 
diff --git a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
index 383f8dd2..acc301fd 100644
--- a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
+++ b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
@@ -9,20 +9,20 @@
 
   5 Added function symbols not referenced by debug info:
 
-    __libc_csu_fini
-    __libc_csu_init
-    base_info_ref
-    base_info_unref
-    main
+    [A] __libc_csu_fini
+    [A] __libc_csu_init
+    [A] base_info_ref
+    [A] base_info_unref
+    [A] main
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
 Removed binaries:
-  /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [D] /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
 Added binaries:
-  /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [A] /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
diff --git a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
index 37e6b486..9d1f078d 100644
--- a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
+++ b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
@@ -4,10 +4,10 @@
 
   4 Added functions:
 
-    'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
-    'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
-    'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
-    'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
+    [A] 'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
+    [A] 'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
+    [A] 'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
+    [A] 'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
 
 ================ end of changes of 'libdw-0.170.so'===============
 
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index 0c097b6b..46581156 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -4,9 +4,9 @@
 
   3 Added functions:
 
-    'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
-    'function int _IceTransListen(const char*)'    {_IceTransListen}
-    'function int _IceTransReceived(const char*)'    {_IceTransReceived}
+    [A] 'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
+    [A] 'function int _IceTransListen(const char*)'    {_IceTransListen}
+    [A] 'function int _IceTransReceived(const char*)'    {_IceTransReceived}
 
   1 function with some indirect sub-type change:
 
@@ -88,7 +88,7 @@
 
   1 Removed variable:
 
-    'const in6_addr in6addr_any'    {in6addr_any}
+    [D] 'const in6_addr in6addr_any'    {in6addr_any}
 
   2 Changed variables:
 
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index b3be1535..b9d9d4d9 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -46,11 +46,11 @@
 
   1 Removed function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
+    [D] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
 
   1 Added function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
+    [A] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
 
 
 ================ end of changes of 'libiso9660++.so.0.0.0'===============
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 3819aed9..34514ee2 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -4,11 +4,11 @@
 
   1 Removed function:
 
-    'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
+    [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
 
   1 Added function:
 
-    'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
+    [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index c227fa5c..6cba71de 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -24,7 +24,7 @@
 
   1 Added function:
 
-    'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
+    [A] 'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
index 9251c43f..545f4947 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
index 9251c43f..545f4947 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index b885629e..28c7185a 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   6 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index 69f438ea..0d78f820 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   8 functions with some indirect sub-type change:
 
@@ -231,9 +231,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -245,46 +245,46 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -294,15 +294,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index de74f1c5..ce886ce9 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   7 functions with some indirect sub-type change:
 
@@ -87,9 +87,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -101,46 +101,46 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -150,15 +150,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
diff --git a/tests/data/test-diff-pkg/test-rpm-report-0.txt b/tests/data/test-diff-pkg/test-rpm-report-0.txt
index 3fb8b8cc..5c5298a5 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-0.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,13 +25,13 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-1.txt b/tests/data/test-diff-pkg/test-rpm-report-1.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-1.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-1.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-2.txt b/tests/data/test-diff-pkg/test-rpm-report-2.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-2.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-2.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-3.txt b/tests/data/test-diff-pkg/test-rpm-report-3.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-3.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-3.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-5.txt b/tests/data/test-diff-pkg/test-rpm-report-5.txt
index a1015ef8..5095eb76 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-5.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-5.txt
@@ -5,8 +5,8 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
index a0cb5cf7..0ab050b2 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index e64a5b55..63792b6b 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
index 1d859f62..65fb16cb 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index 80012c1e..e12412dc 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index fa1d882f..f4be96f4 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
index 8aab663e..d1e246cf 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed (1 filtered out), 1 Added variab
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index fa1d882f..f4be96f4 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index 47fe3d83..70ff9319 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
index be6bc1ed..2ebce7a5 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 1 Removed, 0 Changed (1 filtered out), 0 Added variab
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index 47fe3d83..70ff9319 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
index ad029060..803f2d82 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
@@ -5,6 +5,6 @@ Variable symbols changes summary: 0 Removed, 2 Added variable symbols not refere
 
 2 Added variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [A] global_var1
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
index 1756ef53..779086e5 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 2 Removed, 1 Added variable symbols not refere
 
 2 Removed variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [D] global_var1
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
index 2b4f9883..174f1b93 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
@@ -6,5 +6,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
index e4442c4d..6ec7d542 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var1
+  [D] global_var1
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
index 2b4f9883..174f1b93 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
@@ -6,5 +6,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index be32d3f7..a3b2b4c0 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
+  [D] 'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
     note that this removes an entry from the vtable of class non_defined_class
 
 1 Added function:
 
-  'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
+  [A] 'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
     note that this adds a new entry to the vtable of class non_defined_class
 
 2 functions with some indirect sub-type change:
diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
index b1ba80e8..1b49d600 100644
--- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
+++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
@@ -3,9 +3,9 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void test2()'    {test2}
+  [D] 'function void test2()'    {test2}
 
 1 Removed variable:
 
-  'char test2_variable'    {test2_variable}
+  [D] 'char test2_variable'    {test2_variable}
 
diff --git a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
index a3241095..40b45b46 100644
--- a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -43,8 +43,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -54,8 +54,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index d774e54d..3d9398ab 100644
--- a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
index a3241095..40b45b46 100644
--- a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -43,8 +43,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -54,8 +54,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
index fc85920c..2fe90725 100644
--- a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,18 +19,18 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
index d774e54d..3d9398ab 100644
--- a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 
 ================ end of changes of 'dbus-binding-tool'===============
diff --git a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index b3123d3c..63378fd8 100644
--- a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -8,8 +8,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added function symbols not referenced by debug info:
 
-    dbus_g_connection_open_private
-    dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_method_invocation_get_g_connection
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -21,8 +21,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
index b3ee9111..006b334e 100644
--- a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
@@ -8,43 +8,43 @@ Comparing the ABI of binaries between nss-util-3.12.6-1.fc14.x86_64.rpm and nss-
 
   37 Added function symbols not referenced by debug info:
 
-    NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
-    NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
-    NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
-    NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
-    NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
-    NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
-    NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
-    NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
-    NSSUTIL_ArgReadLong@@NSSUTIL_3.14
-    NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
-    NSSUTIL_ArgStrip@@NSSUTIL_3.14
-    NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscape@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
-    NSSUTIL_Escape@@NSSUTIL_3.14
-    NSSUTIL_EscapeSize@@NSSUTIL_3.14
-    NSSUTIL_GetVersion@@NSSUTIL_3.13
-    NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_MkNSSString@@NSSUTIL_3.14
-    NSSUTIL_MkSlotString@@NSSUTIL_3.14
-    NSSUTIL_Quote@@NSSUTIL_3.14
-    NSSUTIL_QuoteSize@@NSSUTIL_3.14
-    NSS_InitializePRErrorTable@@NSSUTIL_3.13
-    PORT_DestroyCheapArena@@NSSUTIL_3.24
-    PORT_InitCheapArena@@NSSUTIL_3.24
-    PORT_RegExpSearch@@NSSUTIL_3.12.7
-    SECITEM_AllocArray@@NSSUTIL_3.15
-    SECITEM_DupArray@@NSSUTIL_3.15
-    SECITEM_FreeArray@@NSSUTIL_3.15
-    SECITEM_ReallocItemV2@@NSSUTIL_3.15
-    SECITEM_ZfreeArray@@NSSUTIL_3.15
-    _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
-    _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
-    _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
+    [A] NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
+    [A] NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgReadLong@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgStrip@@NSSUTIL_3.14
+    [A] NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscape@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_Escape@@NSSUTIL_3.14
+    [A] NSSUTIL_EscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_GetVersion@@NSSUTIL_3.13
+    [A] NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_MkNSSString@@NSSUTIL_3.14
+    [A] NSSUTIL_MkSlotString@@NSSUTIL_3.14
+    [A] NSSUTIL_Quote@@NSSUTIL_3.14
+    [A] NSSUTIL_QuoteSize@@NSSUTIL_3.14
+    [A] NSS_InitializePRErrorTable@@NSSUTIL_3.13
+    [A] PORT_DestroyCheapArena@@NSSUTIL_3.24
+    [A] PORT_InitCheapArena@@NSSUTIL_3.24
+    [A] PORT_RegExpSearch@@NSSUTIL_3.12.7
+    [A] SECITEM_AllocArray@@NSSUTIL_3.15
+    [A] SECITEM_DupArray@@NSSUTIL_3.15
+    [A] SECITEM_FreeArray@@NSSUTIL_3.15
+    [A] SECITEM_ReallocItemV2@@NSSUTIL_3.15
+    [A] SECITEM_ZfreeArray@@NSSUTIL_3.15
+    [A] _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
+    [A] _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
+    [A] _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
 
 ================ end of changes of 'libnssutil3.so'===============
 
diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
index 0a953a63..8e6fdd4e 100644
--- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
@@ -6,9 +6,9 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   3 Added functions:
 
-    'function const char* vte_get_features()'    {vte_get_features}
-    'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
-    'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
+    [A] 'function const char* vte_get_features()'    {vte_get_features}
+    [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
+    [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
 
 ================ end of changes of 'libvte-2.91.so.0.3901.0'===============
 
@@ -20,7 +20,7 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   1 Added variable symbol not referenced by debug info:
 
-    stderr
+    [A] stderr
 
 ================ end of changes of 'gnome-pty-helper'===============
 
-- 
2.25.0.265.gbab2e86ba0-goog

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C].
  2020-01-01  0:00 ` [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C] Giuliano Procida via libabigail
@ 2020-01-01  0:00   ` Dodji Seketeli
  2020-01-01  0:00   ` [PATCH 2/2 v2] " Giuliano Procida via libabigail
  1 sibling, 0 replies; 7+ messages in thread
From: Dodji Seketeli @ 2020-01-01  0:00 UTC (permalink / raw)
  To: Giuliano Procida; +Cc: libabigail, kernel-team

Hey Giuliano,

Thank you for looking into this.  I have some comments down below.

Giuliano Procida <gprocida@google.com> a écrit:

> These tags were previously only emitted by the default reporter if the
> there were more than 100 (hard-coded constant) items in a a list. The
> leaf reporter emitted them unconditionally. This change simplifies the
> code, makes output more consistent and makes it easier to interpret
> diffs of diff output.
>
> 	* src/abg-default-reporter.cc (report): Remove calculations of
>         number of changes (total) and arbitrary threshold (large_num)
>         and emit prefixes ([A], [D], [C]) unconditionally.
>         * tests/data/test-*/*report*.txt: Add prefixes to reports.

When I run the testsuite with this patch, I get a regression in
runtestdiffpkg.  Maybe the part of this patch that emits the [A],[D]
prefixes for added/removed ELF symbols not referenced by debug info and
for binaries (by abipkgdiff) is missing?

Here is the error I am getting when running the runtestdiffpkg test:

$ ./build/tests/runtestdiffpkg 
--- /home/dodji/git/libabigail/patches/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt	2020-03-06 15:34:18.428218583 +0100
+++ /home/dodji/git/libabigail/patches/build/tests/output/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt	2020-03-06 15:59:59.346851954 +0100
@@ -23,6 +23,6 @@
 ================ end of changes of 'dbus-binding-tool'===============
 
 Removed binaries:
-  [D] /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
 Added binaries:
-  [A] /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
--- /home/dodji/git/libabigail/patches/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt	2020-03-06 15:34:18.428218583 +0100
+++ /home/dodji/git/libabigail/patches/build/tests/output/test-diff-pkg/PR24690/PR24690-report-0.txt	2020-03-06 16:00:02.605904230 +0100
@@ -24,9 +24,9 @@
 
   3 removed types unreachable from any public interface:
 
-    [A] struct _GUnixFDList at gunixfdlist.h:58:1
-    [A] typedef GUnixFDList at giotypes.h:549:1
-    [A] typedef GUnixFDListPrivate at gunixfdlist.h:41:1
+    struct _GUnixFDList at gunixfdlist.h:58:1
+    typedef GUnixFDList at giotypes.h:549:1
+    typedef GUnixFDListPrivate at gunixfdlist.h:41:1
 
   1 changed type unreachable from any public interface:
 
$ 

[...]

Cheers,

-- 
		Dodji

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] Add space missing between "[C]" tag and description of changed item.
@ 2020-01-01  0:00 Giuliano Procida via libabigail
  2020-01-01  0:00 ` Dodji Seketeli
  2020-01-01  0:00 ` [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C] Giuliano Procida via libabigail
  0 siblings, 2 replies; 7+ messages in thread
From: Giuliano Procida via libabigail @ 2020-01-01  0:00 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida

All such tags are now followed by a space and are more readable.

	* src/abg-default-reporter.cc (report(corpus_diff)): Output
	space after "[C]".
	* src/abg-leaf-reporter.cc (report(corpus_diff)): Output space
	after "[C]"
	* tests/data/test-*/*report*.txt: Update all the test
	reports.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-default-reporter.cc                   |  4 +-
 src/abg-leaf-reporter.cc                      |  2 +-
 .../test0-fn-changed-report-0.txt             |  4 +-
 .../test0-fn-changed-report-2.txt             |  4 +-
 .../test7-fn-changed-report-0.txt             |  4 +-
 .../test-loc-with-locs-report.txt             |  2 +-
 .../test-loc-without-locs-report.txt          |  2 +-
 .../test1-voffset-change-report0.txt          |  4 +-
 .../test-abidiff/test-PR18791-report0.txt     | 34 ++++++-------
 .../PR25058-liblttng-ctl-report-1.txt         | 50 +++++++++----------
 .../test-23-diff-arch-report-0.txt            |  2 +-
 tests/data/test-diff-dwarf/test0-report.txt   |  2 +-
 tests/data/test-diff-dwarf/test1-report.txt   |  2 +-
 tests/data/test-diff-dwarf/test10-report.txt  |  2 +-
 tests/data/test-diff-dwarf/test11-report.txt  |  2 +-
 tests/data/test-diff-dwarf/test13-report.txt  |  2 +-
 .../test-diff-dwarf/test15-enum-report.txt    |  2 +-
 tests/data/test-diff-dwarf/test2-report.txt   |  2 +-
 .../test20-add-fn-parm-report-0.txt           |  2 +-
 .../test21-redundant-fn-report-0.txt          |  4 +-
 .../test22-changed-parm-c-report-0.txt        |  2 +-
 .../test24-added-fn-parms-report-0.txt        |  2 +-
 .../test25-removed-fn-parms-report-0.txt      |  2 +-
 ...t26-added-parms-before-variadic-report.txt |  8 +--
 .../test27-local-base-diff-report.txt         |  4 +-
 .../test28-vtable-changes-report-0.txt        |  2 +-
 tests/data/test-diff-dwarf/test3-report.txt   |  2 +-
 .../test30-vtable-changes-report-0.txt        |  2 +-
 .../test31-vtable-changes-report-0.txt        |  2 +-
 .../test32-fnptr-changes-report-0.txt         |  6 +--
 .../test33-fnref-changes-report-0.txt         |  6 +--
 .../test34-pr19173-libfoo-report-0.txt        |  2 +-
 ...t35-pr19173-libfoo-long-clang-report-0.txt |  2 +-
 ...est35-pr19173-libfoo-long-gcc-report-0.txt |  2 +-
 .../test36-ppc64-aliases-report-0.txt         |  2 +-
 .../test-diff-dwarf/test37-union-report-0.txt |  2 +-
 .../test-diff-dwarf/test38-union-report-0.txt |  2 +-
 .../test-diff-dwarf/test39-union-report-0.txt |  2 +-
 tests/data/test-diff-dwarf/test4-report.txt   |  2 +-
 .../data/test-diff-dwarf/test40-report-0.txt  |  6 +--
 .../test41-PR20476-hidden-report-0.txt        |  2 +-
 .../test42-PR21296-clanggcc-report0.txt       | 22 ++++----
 .../test43-PR22913-report-0.txt               |  2 +-
 .../test44-anon-struct-union-report-0.txt     |  2 +-
 .../test45-anon-dm-change-report-0.txt        |  4 +-
 .../test-diff-dwarf/test46-rust-report-0.txt  |  2 +-
 tests/data/test-diff-dwarf/test5-report.txt   |  2 +-
 tests/data/test-diff-dwarf/test6-report.txt   |  2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |  2 +-
 tests/data/test-diff-dwarf/test9-report.txt   |  2 +-
 .../libtest45-basic-type-change-report-0.txt  |  8 +--
 .../libtest45-basic-type-change-report-1.txt  |  8 +--
 .../test-PR24731-report-1.txt                 |  2 +-
 tests/data/test-diff-filter/test0-report.txt  |  2 +-
 tests/data/test-diff-filter/test01-report.txt |  2 +-
 tests/data/test-diff-filter/test1-report.txt  |  2 +-
 tests/data/test-diff-filter/test10-report.txt |  2 +-
 tests/data/test-diff-filter/test11-report.txt |  2 +-
 tests/data/test-diff-filter/test13-report.txt |  2 +-
 .../data/test-diff-filter/test14-0-report.txt |  2 +-
 .../data/test-diff-filter/test14-1-report.txt |  4 +-
 .../data/test-diff-filter/test15-0-report.txt |  2 +-
 .../data/test-diff-filter/test15-1-report.txt |  4 +-
 .../data/test-diff-filter/test16-report-2.txt |  2 +-
 tests/data/test-diff-filter/test16-report.txt |  2 +-
 .../data/test-diff-filter/test17-0-report.txt |  2 +-
 .../data/test-diff-filter/test17-1-report.txt |  4 +-
 tests/data/test-diff-filter/test18-report.txt |  2 +-
 .../test-diff-filter/test19-enum-report-1.txt |  2 +-
 tests/data/test-diff-filter/test2-report.txt  |  4 +-
 .../test21-compatible-vars-report-0.txt       |  2 +-
 .../test22-compatible-fns-report-0.txt        |  2 +-
 ...st23-redundant-fn-parm-change-report-0.txt |  2 +-
 .../test24-compatible-vars-report-1.txt       |  2 +-
 .../test25-cyclic-type-report-0.txt           |  2 +-
 .../test25-cyclic-type-report-1.txt           |  2 +-
 ...st26-qualified-redundant-node-report-0.txt |  2 +-
 ...st26-qualified-redundant-node-report-1.txt |  2 +-
 ...t-and-filtered-children-nodes-report-0.txt |  2 +-
 ...t-and-filtered-children-nodes-report-1.txt |  4 +-
 ...t-and-filtered-children-nodes-report-2.txt |  4 +-
 ...t-and-filtered-children-nodes-report-0.txt |  2 +-
 ...t-and-filtered-children-nodes-report-1.txt |  6 +--
 ...st29-finer-redundancy-marking-report-0.txt |  6 +--
 tests/data/test-diff-filter/test3-report.txt  |  2 +-
 .../test30-pr18904-rvalueref-report0.txt      | 14 +++---
 .../test30-pr18904-rvalueref-report1.txt      | 14 +++---
 .../test30-pr18904-rvalueref-report2.txt      | 14 +++---
 .../test31-pr18535-libstdc++-report-0.txt     |  4 +-
 .../test31-pr18535-libstdc++-report-1.txt     |  4 +-
 .../test32-ppc64le-struct-change-report0.txt  |  2 +-
 .../test35-pr18754-no-added-syms-report-0.txt | 14 +++---
 .../test35-pr18754-no-added-syms-report-1.txt |  2 +-
 .../data/test-diff-filter/test36-report-0.txt |  4 +-
 .../data/test-diff-filter/test37-report-0.txt |  6 +--
 .../test39/test39-report-0.txt                |  4 +-
 .../data/test-diff-filter/test41-report-0.txt |  4 +-
 .../test44-anonymous-data-member-report-0.txt |  2 +-
 tests/data/test-diff-filter/test6-report.txt  |  2 +-
 tests/data/test-diff-filter/test7-report.txt  |  2 +-
 tests/data/test-diff-filter/test9-report.txt  |  2 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  4 +-
 .../data/test-diff-pkg/dirpkg-1-report-1.txt  |  2 +-
 .../data/test-diff-pkg/dirpkg-2-report-1.txt  |  2 +-
 .../data/test-diff-pkg/dirpkg-3-report-1.txt  |  2 +-
 .../data/test-diff-pkg/dirpkg-3-report-2.txt  |  2 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |  6 +--
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |  2 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |  4 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   | 10 ++--
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-0.txt |  4 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-1.txt |  4 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 12 ++---
 .../symlink-dir-test1-report0.txt             |  2 +-
 .../data/test-diff-pkg/tarpkg-0-report-0.txt  |  2 +-
 .../data/test-diff-pkg/tarpkg-1-report-0.txt  |  2 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt | 16 +++---
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt | 14 +++---
 .../libtest48-soname-abixml-report-1.txt      |  2 +-
 .../test0-type-suppr-report-0.txt             |  2 +-
 .../test0-type-suppr-report-3.txt             |  2 +-
 .../test0-type-suppr-report-5.txt             |  2 +-
 .../test0-type-suppr-report-7.txt             |  2 +-
 .../test1-typedef-suppr-report-0.txt          |  4 +-
 .../test1-typedef-suppr-report-2.txt          |  2 +-
 .../test10-changed-parm-c-report-0.txt        |  2 +-
 .../test11-add-data-member-report-0.txt       |  2 +-
 .../test12-add-data-member-report-0.txt       |  2 +-
 .../test12-add-data-member-report-2.txt       |  2 +-
 .../test13-suppr-through-pointer-report-0.txt |  4 +-
 .../test13-suppr-through-pointer-report-1.txt |  2 +-
 .../test14-suppr-non-redundant-report-0.txt   |  2 +-
 .../test14-suppr-non-redundant-report-1.txt   |  2 +-
 .../test15-suppr-added-fn-report-0.txt        |  2 +-
 .../test15-suppr-added-fn-report-1.txt        |  2 +-
 .../test15-suppr-added-fn-report-5.txt        |  2 +-
 .../test16-suppr-removed-fn-report-0.txt      |  2 +-
 .../test16-suppr-removed-fn-report-2.txt      |  2 +-
 .../test16-suppr-removed-fn-report-5.txt      |  2 +-
 .../test17-suppr-added-var-report-0.txt       |  2 +-
 .../test17-suppr-added-var-report-2.txt       |  2 +-
 .../test17-suppr-added-var-report-5.txt       |  2 +-
 .../test18-suppr-removed-var-report-0.txt     |  2 +-
 .../test18-suppr-removed-var-report-2.txt     |  2 +-
 .../test18-suppr-removed-var-report-5.txt     |  2 +-
 .../test2-struct-suppr-report-0.txt           |  2 +-
 .../test23-alias-filter-report-0.txt          |  2 +-
 .../test23-alias-filter-report-2.txt          |  2 +-
 .../test24-soname-report-1.txt                |  2 +-
 .../test24-soname-report-10.txt               |  2 +-
 .../test24-soname-report-12.txt               |  2 +-
 .../test24-soname-report-14.txt               |  2 +-
 .../test24-soname-report-16.txt               |  2 +-
 .../test24-soname-report-4.txt                |  2 +-
 .../test25-typedef-report-0.txt               |  4 +-
 .../test26-loc-suppr-report-0.txt             |  2 +-
 .../test26-loc-suppr-report-3.txt             |  2 +-
 .../test29-soname-report-3.txt                |  2 +-
 .../test29-soname-report-6.txt                |  2 +-
 .../test29-soname-report-8.txt                |  2 +-
 .../test3-struct-suppr-report-0.txt           |  2 +-
 .../test3-struct-suppr-report-1.txt           |  2 +-
 .../test3-struct-suppr-report-2.txt           |  2 +-
 .../data/test-diff-suppr/test30-report-0.txt  |  4 +-
 .../data/test-diff-suppr/test31-report-1.txt  |  2 +-
 .../data/test-diff-suppr/test32-report-0.txt  |  4 +-
 .../data/test-diff-suppr/test32-report-1.txt  |  2 +-
 .../data/test-diff-suppr/test33-report-0.txt  |  2 +-
 .../test39-opaque-type-report-0.txt           |  2 +-
 .../test4-local-suppr-report-0.txt            |  2 +-
 .../test4-local-suppr-report-1.txt            |  2 +-
 .../test41-enumerator-changes-report-0.txt    |  4 +-
 .../test42-negative-suppr-type-report-0.txt   |  2 +-
 .../test42-negative-suppr-type-report-1.txt   |  2 +-
 .../test5-fn-suppr-report-0.txt               |  4 +-
 .../test5-fn-suppr-report-1.txt               |  2 +-
 .../test5-fn-suppr-report-2.txt               |  2 +-
 .../test5-fn-suppr-report-3.txt               |  2 +-
 .../test5-fn-suppr-report-4.txt               |  2 +-
 .../test5-fn-suppr-report-5.txt               |  2 +-
 .../test6-fn-suppr-report-0-1.txt             |  6 +--
 .../test6-fn-suppr-report-0.txt               |  6 +--
 .../test6-fn-suppr-report-1.txt               |  4 +-
 .../test6-fn-suppr-report-2.txt               |  4 +-
 .../test6-fn-suppr-report-3.txt               |  4 +-
 .../test6-fn-suppr-report-4.txt               |  4 +-
 .../test7-var-suppr-report-0.txt              |  4 +-
 .../test7-var-suppr-report-1.txt              |  2 +-
 .../test7-var-suppr-report-2.txt              |  2 +-
 .../test7-var-suppr-report-3.txt              |  2 +-
 .../test7-var-suppr-report-4.txt              |  2 +-
 .../test7-var-suppr-report-7.txt              |  2 +-
 .../test7-var-suppr-report-8.txt              |  4 +-
 .../test8-redundant-fn-report-0.txt           |  2 +-
 .../test8-redundant-fn-report-1.txt           |  4 +-
 .../test9-changed-parm-c-report-0.txt         |  2 +-
 .../test9-changed-parm-c-report-1.txt         |  2 +-
 197 files changed, 357 insertions(+), 357 deletions(-)

diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 7642639e..aaf083b3 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1913,7 +1913,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  if (diff->to_be_reported())
 	    {
 	      function_decl_sptr fn = (*i)->first_function_decl();
-	      out << indent << "  [C]'"
+	      out << indent << "  [C] '"
 		  << fn->get_pretty_representation() << "'";
 	      report_loc_info((*i)->second_function_decl(), *ctxt, out);
 	      out << " has some indirect sub-type changes:\n";
@@ -2090,7 +2090,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  n1 = diff->first_subject()->get_pretty_representation();
 	  n2 = diff->second_subject()->get_pretty_representation();
 
-	  out << indent << "  [C]'" << n1 << "' was changed";
+	  out << indent << "  [C] '" << n1 << "' was changed";
 	  if (n1 != n2)
 	    out << " to '" << n2 << "'";
 	  report_loc_info(diff->second_subject(), *ctxt, out);
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index 791b301c..5d810818 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -1130,7 +1130,7 @@ leaf_reporter::report(const corpus_diff& d,
 	  if (diff_to_be_reported(diff.get()))
 	    {
 	      function_decl_sptr fn = (*i)->first_function_decl();
-	      out << indent << "  [C]'"
+	      out << indent << "  [C] '"
 		  << fn->get_pretty_representation() << "'";
 	      report_loc_info((*i)->second_function_decl(), *ctxt, out);
 	      out << " has some sub-type changes:\n";
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-0.txt b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
index 405df690..b8884f8f 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char libapp::S0::m1', at offset 32 (in bits)
 
-  [C]'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1':
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-2.txt b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
index 7c09f5ff..fc55ef62 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v1.cc:61:1 has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v1.cc:61:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0' at test0-fn-changed-libapp-v1.cc:10:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char libapp::S0::m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:13:1
 
-  [C]'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v1.cc:69:1 has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v1.cc:69:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1' at test0-fn-changed-libapp-v1.cc:21:1:
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-0.txt b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
index 3c130c01..19db76e3 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
@@ -4,13 +4,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function float add(float, float)' has some indirect sub-type changes:
+  [C] 'function float add(float, float)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'float' to 'int'
       type size hasn't changed
 
 
-  [C]'function void print(const Student)' has some indirect sub-type changes:
+  [C] 'function void print(const Student)' has some indirect sub-type changes:
     parameter 1 of type 'const Student' has sub-type changes:
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt b/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
index d62e405e..53672744 100644
--- a/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
+++ b/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void x(unsigned char)' at test-loc-v1.c:1:1 has some indirect sub-type changes:
+  [C] 'function void x(unsigned char)' at test-loc-v1.c:1:1 has some indirect sub-type changes:
     parameter 1 of type 'unsigned char' changed:
       type name changed from 'unsigned char' to 'signed char'
       type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt b/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
index 5a72047e..6893e3fc 100644
--- a/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
+++ b/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void x(unsigned char)' has some indirect sub-type changes:
+  [C] 'function void x(unsigned char)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned char' changed:
       type name changed from 'unsigned char' to 'signed char'
       type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt b/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
index ecc6783b..c8396254 100644
--- a/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'method virtual int C::virtual_func0()' has some indirect sub-type changes:
+  [C] 'method virtual int C::virtual_func0()' has some indirect sub-type changes:
     the vtable offset of method virtual int C::virtual_func0() changed from 0 to 1
       note that this is an ABI incompatible change to the vtable of class C
 
-  [C]'method virtual char C::virtual_func1()' has some indirect sub-type changes:
+  [C] 'method virtual char C::virtual_func1()' has some indirect sub-type changes:
     the vtable offset of method virtual char C::virtual_func1() changed from 1 to 0
       note that this is an ABI incompatible change to the vtable of class C
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index d5f1e52c..e24ce778 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 17 functions with some indirect sub-type change:
 
-  [C]'method sigc::connection::connection(sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::connection::connection(sigc::slot_base&)' has some indirect sub-type changes:
     parameter 1 of type 'sigc::slot_base&' has sub-type changes:
       in referenced type 'class sigc::slot_base':
         type size hasn't changed
@@ -62,7 +62,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'method sigc::connection& sigc::connection::operator=(const sigc::connection&)' has some indirect sub-type changes:
+  [C] 'method sigc::connection& sigc::connection::operator=(const sigc::connection&)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'struct sigc::connection':
         type size hasn't changed
@@ -74,11 +74,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::connection':
         unqualified underlying type 'struct sigc::connection' changed, as reported earlier
 
-  [C]'method void sigc::connection::set_slot(sigc::slot_base*)' has some indirect sub-type changes:
+  [C] 'method void sigc::connection::set_slot(sigc::slot_base*)' has some indirect sub-type changes:
     parameter 1 of type 'sigc::slot_base*' has sub-type changes:
       pointed to type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::connect(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::connect(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed:
         typedef name changed from std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator to std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator
@@ -87,13 +87,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::erase(sigc::internal::signal_impl::iterator_type)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::erase(sigc::internal::signal_impl::iterator_type)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
     parameter 1 of type 'typedef sigc::internal::signal_impl::iterator_type' changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::insert(sigc::internal::signal_impl::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::insert(sigc::internal::signal_impl::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
     parameter 1 of type 'typedef sigc::internal::signal_impl::iterator_type' changed:
@@ -102,20 +102,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::connect(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::connect(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::erase(sigc::signal_base::iterator_type)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::erase(sigc::signal_base::iterator_type)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'typedef sigc::signal_base::iterator_type' changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl* sigc::signal_base::impl()' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl* sigc::signal_base::impl()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct sigc::internal::signal_impl':
         type size changed from 192 to 256 (in bits)
@@ -139,7 +139,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::insert(sigc::signal_base::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::insert(sigc::signal_base::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'typedef sigc::signal_base::iterator_type' changed:
@@ -148,7 +148,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base& sigc::signal_base::operator=(const sigc::signal_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base& sigc::signal_base::operator=(const sigc::signal_base&)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'struct sigc::signal_base':
         type size hasn't changed
@@ -164,35 +164,35 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::signal_base':
         unqualified underlying type 'struct sigc::signal_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::signal_base(const sigc::signal_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::signal_base(const sigc::signal_base&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::signal_base&' has sub-type changes:
       in referenced type 'const sigc::signal_base':
         unqualified underlying type 'struct sigc::signal_base' changed, as reported earlier
 
-  [C]'method sigc::slot_base& sigc::slot_base::operator=(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::slot_base& sigc::slot_base::operator=(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       referenced type 'class sigc::slot_base' changed, as reported earlier
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::slot_base::slot_base(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::slot_base::slot_base(const sigc::slot_base&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::trackable_callback_list* sigc::trackable::callback_list()' has some indirect sub-type changes:
+  [C] 'method sigc::internal::trackable_callback_list* sigc::trackable::callback_list()' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct sigc::internal::trackable_callback_list' changed, as reported earlier
 
-  [C]'method sigc::trackable& sigc::trackable::operator=(const sigc::trackable&)' has some indirect sub-type changes:
+  [C] 'method sigc::trackable& sigc::trackable::operator=(const sigc::trackable&)' has some indirect sub-type changes:
     return type changed:
       referenced type 'struct sigc::trackable' changed, as reported earlier
     parameter 1 of type 'const sigc::trackable&' has sub-type changes:
       in referenced type 'const sigc::trackable':
         unqualified underlying type 'struct sigc::trackable' changed, as reported earlier
 
-  [C]'method sigc::trackable::trackable(const sigc::trackable&)' has some indirect sub-type changes:
+  [C] 'method sigc::trackable::trackable(const sigc::trackable&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::trackable&' has sub-type changes:
       in referenced type 'const sigc::trackable':
         unqualified underlying type 'struct sigc::trackable' changed, as reported earlier
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index cb41cc76..29f823ec 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -85,7 +85,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 25 functions with some indirect sub-type change:
 
-  [C]'function int lttng_add_context(lttng_handle*, lttng_event_context*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_add_context(lttng_handle*, lttng_event_context*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event_context*' has sub-type changes:
       in pointed to type 'struct lttng_event_context':
         type size hasn't changed
@@ -110,7 +110,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
            to:
              union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
 
-  [C]'function lttng_condition_type lttng_condition_get_type(const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_condition_type lttng_condition_get_type(const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       type size hasn't changed
       3 enumerator insertions:
@@ -119,7 +119,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
 
 
-  [C]'function int lttng_disable_event_ext(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_disable_event_ext(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       in pointed to type 'struct lttng_event':
         type size hasn't changed
@@ -131,40 +131,40 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 
 
-  [C]'function int lttng_enable_event(lttng_handle*, lttng_event*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event(lttng_handle*, lttng_event*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_enable_event_with_exclusions(lttng_handle*, lttng_event*, const char*, const char*, int, char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event_with_exclusions(lttng_handle*, lttng_event*, const char*, const char*, int, char**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_enable_event_with_filter(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event_with_filter(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function lttng_condition_type lttng_evaluation_get_type(const lttng_evaluation*)' has some indirect sub-type changes:
+  [C] 'function lttng_condition_type lttng_evaluation_get_type(const lttng_evaluation*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_condition_type' changed, as reported earlier
 
-  [C]'function int lttng_event_get_exclusion_name(lttng_event*, size_t, const char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_exclusion_name(lttng_event*, size_t, const char**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_event_get_exclusion_name_count(lttng_event*)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_exclusion_name_count(lttng_event*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_event_get_filter_expression(lttng_event*, const char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_filter_expression(lttng_event*, const char**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_events(lttng_handle*, const char*, lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_events(lttng_handle*, const char*, lttng_event**)' has some indirect sub-type changes:
     parameter 3 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_sessions(lttng_session**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_sessions(lttng_session**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_session**' has sub-type changes:
       in pointed to type 'lttng_session*':
         in pointed to type 'struct lttng_session':
@@ -175,12 +175,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
           1 data member insertion:
             'union {char padding[12]; void* ptr;} lttng_session::extended', at offset 34944 (in bits)
 
-  [C]'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_tracepoint_fields(lttng_handle*, lttng_event_field**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_tracepoint_fields(lttng_handle*, lttng_event_field**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event_field**' has sub-type changes:
       in pointed to type 'lttng_event_field*':
         in pointed to type 'struct lttng_event_field':
@@ -190,12 +190,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
              details were reported earlier
 
 
-  [C]'function int lttng_list_tracepoints(lttng_handle*, lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_tracepoints(lttng_handle*, lttng_event**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_get_next_notification(lttng_notification_channel*, lttng_notification**)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_get_next_notification(lttng_notification_channel*, lttng_notification**)' has some indirect sub-type changes:
     return type changed:
       type size hasn't changed
       1 enumerator insertion:
@@ -209,27 +209,27 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
             'bool lttng_notification::owns_elements', at offset 128 (in bits)
 
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_notification_channel_status' changed, as reported earlier
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_unsubscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_unsubscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_notification_channel_status' changed, as reported earlier
 
-  [C]'function void lttng_notification_destroy(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function void lttng_notification_destroy(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function const lttng_condition* lttng_notification_get_condition(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function const lttng_condition* lttng_notification_get_condition(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function const lttng_evaluation* lttng_notification_get_evaluation(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function const lttng_evaluation* lttng_notification_get_evaluation(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function filter_parser_ctx* lttng_yyget_extra(yyscan_t)' has some indirect sub-type changes:
+  [C] 'function filter_parser_ctx* lttng_yyget_extra(yyscan_t)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct filter_parser_ctx':
         type size hasn't changed
@@ -333,7 +333,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
               'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
 
 
-  [C]'function YYSTYPE* lttng_yyget_lval(yyscan_t)' has some indirect sub-type changes:
+  [C] 'function YYSTYPE* lttng_yyget_lval(yyscan_t)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'typedef YYSTYPE':
         underlying type 'union YYSTYPE' changed:
@@ -346,11 +346,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
           to:
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
-  [C]'function void lttng_yyset_extra(filter_parser_ctx*, yyscan_t)' has some indirect sub-type changes:
+  [C] 'function void lttng_yyset_extra(filter_parser_ctx*, yyscan_t)' has some indirect sub-type changes:
     parameter 1 of type 'filter_parser_ctx*' has sub-type changes:
       pointed to type 'struct filter_parser_ctx' changed, as reported earlier
 
-  [C]'function void lttng_yyset_lval(YYSTYPE*, yyscan_t)' has some indirect sub-type changes:
+  [C] 'function void lttng_yyset_lval(YYSTYPE*, yyscan_t)' has some indirect sub-type changes:
     parameter 1 of type 'YYSTYPE*' has sub-type changes:
       pointed to type 'typedef YYSTYPE' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
index 7443ceb3..b1fad0ee 100644
--- a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
+++ b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
@@ -6,7 +6,7 @@ architecture changed from 'elf-intel-80386' to 'elf-amd-x86_64'
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo()' has some indirect sub-type changes:
+  [C] 'function int foo()' has some indirect sub-type changes:
     address size of function changed from 32 bits to 64 bits
 
 
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 7c2ac820..24d5e022 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-dwarf/test1-report.txt b/tests/data/test-diff-dwarf/test1-report.txt
index 50918390..962bfac5 100644
--- a/tests/data/test-diff-dwarf/test1-report.txt
+++ b/tests/data/test-diff-dwarf/test1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 12e1ef77..84400c29 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 1152 to 1280 (in bits)
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 852f84fe..32058bb6 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 1248 to 1536 (in bits)
diff --git a/tests/data/test-diff-dwarf/test13-report.txt b/tests/data/test-diff-dwarf/test13-report.txt
index 20629076..cf29a4fd 100644
--- a/tests/data/test-diff-dwarf/test13-report.txt
+++ b/tests/data/test-diff-dwarf/test13-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 128 to 192 (in bits)
diff --git a/tests/data/test-diff-dwarf/test15-enum-report.txt b/tests/data/test-diff-dwarf/test15-enum-report.txt
index 19326c5b..337d9c35 100644
--- a/tests/data/test-diff-dwarf/test15-enum-report.txt
+++ b/tests/data/test-diff-dwarf/test15-enum-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(E)' has some indirect sub-type changes:
+  [C] 'function void foo(E)' has some indirect sub-type changes:
     parameter 1 of type 'typedef E' has sub-type changes:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test2-report.txt b/tests/data/test-diff-dwarf/test2-report.txt
index 14f8ea8c..902ca456 100644
--- a/tests/data/test-diff-dwarf/test2-report.txt
+++ b/tests/data/test-diff-dwarf/test2-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(int, char)' has some indirect sub-type changes:
+  [C] 'function void foo(int, char)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       entity changed from 'int' to compatible type 'typedef Int'
     parameter 2 of type 'char' changed:
diff --git a/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt b/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
index 434f66d2..f79b6d99 100644
--- a/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
+++ b/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int add(int, int)' has some indirect sub-type changes:
+  [C] 'function int add(int, int)' has some indirect sub-type changes:
     parameter 3 of type 'int' was added
 
 
diff --git a/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt b/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
index bb0cc78c..1582fffc 100644
--- a/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
+++ b/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt b/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
index 8dd07ee7..860fb791 100644
--- a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void fun()' has some indirect sub-type changes:
+  [C] 'function void fun()' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was added
     parameter 2 of type 'char' was added
     parameter 3 of type 'int' was added
diff --git a/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
index 936640b6..78d341e9 100644
--- a/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void fun(unsigned int, char, int)' has some indirect sub-type changes:
+  [C] 'function void fun(unsigned int, char, int)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was removed
     parameter 2 of type 'char' was removed
     parameter 3 of type 'int' was removed
diff --git a/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt b/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
index 133a0c1a..b87e4635 100644
--- a/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
+++ b/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
@@ -3,28 +3,28 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some indirect sub-type change:
 
-  [C]'function void fun1(const char*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun1(const char*, ...)' has some indirect sub-type changes:
     parameter 2 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const char*'
       type size changed from 0 to 64 (in bits)
     parameter 3 of type '...' was added
 
 
-  [C]'function void fun2(const char*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun2(const char*, ...)' has some indirect sub-type changes:
     parameter 2 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const char*'
       type size changed from 0 to 64 (in bits)
     parameter 3 of type '...' was added
 
 
-  [C]'function void fun3(const char*, const int*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun3(const char*, const int*, ...)' has some indirect sub-type changes:
     parameter 3 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const int*'
       type size changed from 0 to 64 (in bits)
     parameter 4 of type '...' was added
 
 
-  [C]'function void fun4(const char*, const int*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun4(const char*, const int*, ...)' has some indirect sub-type changes:
     parameter 3 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const int*'
       type size changed from 0 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
index b104d300..63c7ec8c 100644
--- a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
+++ b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(base&)' has some indirect sub-type changes:
+  [C] 'function void bar(base&)' has some indirect sub-type changes:
     parameter 1 of type 'base&' has sub-type changes:
       in referenced type 'struct base':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char base::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
index 154532fc..361781a1 100644
--- a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
@@ -12,7 +12,7 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 1 function with some indirect sub-type change:
 
-  [C]'method void S::bar()' has some indirect sub-type changes:
+  [C] 'method void S::bar()' has some indirect sub-type changes:
     method void S::bar() is now declared virtual
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test3-report.txt b/tests/data/test-diff-dwarf/test3-report.txt
index d1acbc0e..a556b0f8 100644
--- a/tests/data/test-diff-dwarf/test3-report.txt
+++ b/tests/data/test-diff-dwarf/test3-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method void C1::foo(C0&)' has some indirect sub-type changes:
+  [C] 'method void C1::foo(C0&)' has some indirect sub-type changes:
     parameter 1 of type 'C0&' has sub-type changes:
       in referenced type 'struct C0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
index 5f32f8d4..6b0f772c 100644
--- a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method virtual void S::fn1()' has some indirect sub-type changes:
+  [C] 'method virtual void S::fn1()' has some indirect sub-type changes:
     the vtable offset of method virtual void S::fn1() changed from 3 to 4
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
index 68e8504c..23e6fb52 100644
--- a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method virtual void S::fn1()' has some indirect sub-type changes:
+  [C] 'method virtual void S::fn1()' has some indirect sub-type changes:
     the vtable offset of method virtual void S::fn1() changed from 3 to 2
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 3e263d86..1dd410ca 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0()' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)*' changed:
         in pointed to type 'function type int (int)':
@@ -19,14 +19,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C]'function double (int)* fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)* fn1()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'function type double (int)':
         return type changed:
           type name changed from 'double' to 'int'
           type size changed from 64 to 32 (in bits)
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index ff8c934e..46e71c78 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0()' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)&' changed:
         in referenced type 'function type int (int)':
@@ -19,14 +19,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C]'function double (int)& fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)& fn1()' has some indirect sub-type changes:
     return type changed:
       in referenced type 'function type double (int)':
         return type changed:
           type name changed from 'double' to 'int'
           type size changed from 64 to 32 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'class S':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt b/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
index 13292980..5d97f66b 100644
--- a/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
+++ b/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'long int buggy_symbol' was changed:
+  [C] 'long int buggy_symbol' was changed:
     size of symbol changed from 8 to 64
 
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
index 64ad4d54..3db4c087 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
+  [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
      type name changed from 'char[5]' to 'char[10]'
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
index 64ad4d54..3db4c087 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
+  [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
      type name changed from 'char[5]' to 'char[10]'
diff --git a/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt b/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
index 427b62d0..62709474 100644
--- a/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
+++ b/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test37-union-report-0.txt b/tests/data/test-diff-dwarf/test37-union-report-0.txt
index 31f0a98c..c399e94c 100644
--- a/tests/data/test-diff-dwarf/test37-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test37-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test38-union-report-0.txt b/tests/data/test-diff-dwarf/test38-union-report-0.txt
index 69893b19..f7a75df7 100644
--- a/tests/data/test-diff-dwarf/test38-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test38-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test39-union-report-0.txt b/tests/data/test-diff-dwarf/test39-union-report-0.txt
index 1d6b294b..2f70de44 100644
--- a/tests/data/test-diff-dwarf/test39-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test39-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test4-report.txt b/tests/data/test-diff-dwarf/test4-report.txt
index 2df515a4..e784dde6 100644
--- a/tests/data/test-diff-dwarf/test4-report.txt
+++ b/tests/data/test-diff-dwarf/test4-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(C0)' has some indirect sub-type changes:
+  [C] 'function void foo(C0)' has some indirect sub-type changes:
     parameter 1 of type 'class C0' has sub-type changes:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test40-report-0.txt b/tests/data/test-diff-dwarf/test40-report-0.txt
index 8e6ce8c2..d0b8c52c 100644
--- a/tests/data/test-diff-dwarf/test40-report-0.txt
+++ b/tests/data/test-diff-dwarf/test40-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function int bar(S2*)' has some indirect sub-type changes:
+  [C] 'function int bar(S2*)' has some indirect sub-type changes:
     parameter 1 of type 'S2*' has sub-type changes:
       in pointed to type 'struct S2':
         type size changed from 96 to 64 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
          'int S2::m0' offset changed from 32 to 0 (in bits) (by -32 bits)
          'char S2::m1' offset changed from 64 to 32 (in bits) (by -32 bits)
 
-  [C]'function int baz(S3*)' has some indirect sub-type changes:
+  [C] 'function int baz(S3*)' has some indirect sub-type changes:
     parameter 1 of type 'S3*' has sub-type changes:
       in pointed to type 'struct S3':
         type size hasn't changed
@@ -25,7 +25,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'function int foo(S1*)' has some indirect sub-type changes:
+  [C] 'function int foo(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
index 57076505..df387deb 100644
--- a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
+++ b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function Interface* make_interface()' has some indirect sub-type changes:
+  [C] 'function Interface* make_interface()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'class Interface':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
index 34f54514..52692d9f 100644
--- a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
+++ b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 11 functions with some indirect sub-type change:
 
-  [C]'method STR::~STR(int)' has some indirect sub-type changes:
+  [C] 'method STR::~STR(int)' has some indirect sub-type changes:
     linkage names of method STR::~STR(int)
     changed from '_ZN3STRD1Ev, _ZN3STRD2Ev' to '_ZN3STRD2Ev'
 
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'int' was removed
 
 
-  [C]'function std::tuple<STR&&> my_forward_as_tuple<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'function std::tuple<STR&&> my_forward_as_tuple<STR>(STR&&)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'std::tuple<STR&&>' to 'std::tuple<STR &&>'
       type size hasn't changed
@@ -25,23 +25,23 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 base class insertion:
         struct std::_Tuple_impl<0, STR &&>
 
-  [C]'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&)' has some indirect sub-type changes:
     'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&) {_ZNSt10_Head_baseILm0EO3STRLb0EEC2IS0_St9true_typeEEOT_}' now becomes 'method void std::_Head_base<0, STR &&, false>::_Head_base<STR, std::true_type>(STR&&) {_ZNSt10_Head_baseILm0EO3STRLb0EEC2IS0_St9true_typeEEOT_}'
 
-  [C]'method STR& std::_Head_base<0ul, STR&&, false>::_M_head()' has some indirect sub-type changes:
+  [C] 'method STR& std::_Head_base<0ul, STR&&, false>::_M_head()' has some indirect sub-type changes:
     'method STR& std::_Head_base<0ul, STR&&, false>::_M_head() {_ZNSt10_Head_baseILm0EO3STRLb0EE7_M_headERKS2_}' now becomes 'method STR& std::_Head_base<0, STR &&, false>::_M_head() {_ZNSt10_Head_baseILm0EO3STRLb0EE7_M_headERKS2_}'
 
-  [C]'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head()' has some indirect sub-type changes:
+  [C] 'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head()' has some indirect sub-type changes:
     'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head() {_ZNSt11_Tuple_implILm0EJO3STREE7_M_headERKS2_}' now becomes 'method STR& std::_Tuple_impl<0, STR &&>::_M_head() {_ZNSt11_Tuple_implILm0EJO3STREE7_M_headERKS2_}'
 
-  [C]'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_
      and it aliases symbol: _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_
     linkage names of method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)
     changed from '_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_, _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_' to '_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_'
     'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&) {_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_, _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_}' now becomes 'method void std::_Tuple_impl<0, STR &&>::_Tuple_impl<STR, std::false_type>(STR&&) {_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_}'
 
-  [C]'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&)' has some indirect sub-type changes:
+  [C] 'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&)' has some indirect sub-type changes:
     'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&) {_ZSt12__get_helperILm0EO3STRJEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS3_DpT1_EE}' now becomes 'function std::__add_c_ref<STR &&>::type std::__get_helper<0, STR &&>(const std::_Tuple_impl<0, STR &&>&) {_ZSt12__get_helperILm0EO3STRJEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS3_DpT1_EE}'
     return type changed:
       typedef name changed from std::__add_c_ref<STR&&>::type to std::__add_c_ref<STR &&>::type
@@ -50,7 +50,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const std::_Tuple_impl<0ul, STR&&>':
         'const std::_Tuple_impl<0ul, STR&&>' changed to 'const std::_Tuple_impl<0, STR &&>'
 
-  [C]'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&)' has some indirect sub-type changes:
+  [C] 'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&)' has some indirect sub-type changes:
     'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&) {_ZSt3getILm0EJO3STREENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKS7_}' now becomes 'function std::__add_c_ref<STR &&>::type std::get<0, STR &&>(const std::tuple<STR &&>&) {_ZSt3getILm0EJO3STREENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKS7_}'
     return type changed:
       typedef name changed from std::__add_c_ref<STR&&>::type to std::__add_c_ref<STR &&>::type
@@ -59,21 +59,21 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const std::tuple<STR&&>':
         'const std::tuple<STR&&>' changed to 'const std::tuple<STR &&>'
 
-  [C]'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&)' has some indirect sub-type changes:
+  [C] 'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&)' has some indirect sub-type changes:
     'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&) {_ZSt4moveIR3STREONSt16remove_referenceIT_E4typeEOS3_}' now becomes 'function std::remove_reference<STR &>::type&& std::move<STR &>(STR&) {_ZSt4moveIR3STREONSt16remove_referenceIT_E4typeEOS3_}'
     return type changed:
       in referenced type 'typedef std::remove_reference<STR&>::type':
         typedef name changed from std::remove_reference<STR&>::type to std::remove_reference<STR &>::type
 
 
-  [C]'method void std::tuple<STR&&>::tuple<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::tuple<STR&&>::tuple<STR>(STR&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_
      and it aliases symbol: _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_
     linkage names of method void std::tuple<STR&&>::tuple<STR>(STR&&)
     changed from '_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_, _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_' to '_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_'
     'method void std::tuple<STR&&>::tuple<STR>(STR&&) {_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_, _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_}' now becomes 'method void std::tuple<STR &&>::tuple<STR, std::true_type>(STR&&) {_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_}'
 
-  [C]'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>)' has some indirect sub-type changes:
+  [C] 'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>)' has some indirect sub-type changes:
     'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>) {_Z3tplISt5tupleIJO3STREEEvT_}' now becomes 'function void tpl<std::tuple<STR &&> >(std::tuple<STR &&>) {_Z3tplISt5tupleIJO3STREEEvT_}'
     parameter 1 of type 'class std::tuple<STR&&>' changed:
       details were reported earlier
diff --git a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
index 345f7e91..1c0c773d 100644
--- a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
+++ b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function char f1(Struct1Ptr)' has some indirect sub-type changes:
+  [C] 'function char f1(Struct1Ptr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef Struct1Ptr' has sub-type changes:
       underlying type '__anonymous_struct__1*' changed:
         in pointed to type 'struct {char m1; char m2;}':
diff --git a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
index ad8d6332..ff0131a4 100644
--- a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0*)' has some indirect sub-type changes:
     parameter 1 of type 'S0*' has sub-type changes:
       in pointed to type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
index cb92f5ed..e43c3a89 100644
--- a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
+++ b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1&)' has some indirect sub-type changes:
+  [C] 'function void bar(S1&)' has some indirect sub-type changes:
     parameter 1 of type 'S1&' has sub-type changes:
       in referenced type 'struct S1':
         type size changed from 96 to 64 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
 
-  [C]'function void foo(S0&)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test46-rust-report-0.txt b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
index 87544b6f..66538cdf 100644
--- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt
+++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function one::Foo one::foo(u32)' has some indirect sub-type changes:
+  [C] 'function one::Foo one::foo(u32)' has some indirect sub-type changes:
     'function one::Foo one::foo(u32) {foo}' now becomes 'function two::Foo two::foo(u32, u32) {foo}'
     return type changed:
       type name changed from 'one::Foo' to 'two::Foo'
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index c8c9830f..74c9e3bf 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function C0 foo()' has some indirect sub-type changes:
+  [C] 'function C0 foo()' has some indirect sub-type changes:
     return type changed:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test6-report.txt b/tests/data/test-diff-dwarf/test6-report.txt
index 35817256..755d37f8 100644
--- a/tests/data/test-diff-dwarf/test6-report.txt
+++ b/tests/data/test-diff-dwarf/test6-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 727db5a9..5adaea5f 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 126f5d84..914841bd 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'int global_var0' was changed to 'char global_var0':
+  [C] 'int global_var0' was changed to 'char global_var0':
     size of symbol changed from 4 to 1
     type of variable changed:
      type name changed from 'int' to 'char'
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
index 6fb973a4..78be7f06 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some indirect sub-type change:
 
-  [C]'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some indirect sub-type changes:
+  [C] 'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some indirect sub-type changes:
     return type changed:
       in referenced type 'int':
         type name changed from 'int' to 'char'
@@ -18,7 +18,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some indirect sub-type changes:
+  [C] 'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'int':
         type name changed from 'int' to 'char'
@@ -33,7 +33,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some indirect sub-type changes:
+  [C] 'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some indirect sub-type changes:
     return type changed:
       'const int' changed to 'const char'
     parameter 1 of type 'S2&' has sub-type changes:
@@ -46,7 +46,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some indirect sub-type changes:
+  [C] 'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
index c3a54e36..e5e4bd30 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
@@ -5,19 +5,19 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some sub-type change:
 
-  [C]'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some sub-type changes:
+  [C] 'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some sub-type changes:
     return type changed:
       reference type changed from: 'int&' to: 'char&'
 
-  [C]'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some sub-type changes:
+  [C] 'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some sub-type changes:
     return type changed:
       pointer type changed from: 'int*' to: 'char*'
 
-  [C]'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some sub-type changes:
+  [C] 'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some sub-type changes:
     return type changed:
       'const int' changed to 'const char'
 
-  [C]'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some sub-type changes:
+  [C] 'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test-PR24731-report-1.txt b/tests/data/test-diff-filter/test-PR24731-report-1.txt
index d33e5653..759fc39c 100644
--- a/tests/data/test-diff-filter/test-PR24731-report-1.txt
+++ b/tests/data/test-diff-filter/test-PR24731-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void test_func(u)' at test-PR24731-v1.c:3:1 has some indirect sub-type changes:
+  [C] 'function void test_func(u)' at test-PR24731-v1.c:3:1 has some indirect sub-type changes:
     parameter 1 of type 'union u' has sub-type changes:
       type size hasn't changed
       type changed from:
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index d916c773..0d5d2e52 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index 2edddb2b..0407bd46 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test1-report.txt b/tests/data/test-diff-filter/test1-report.txt
index d8154ccd..0c1d1911 100644
--- a/tests/data/test-diff-filter/test1-report.txt
+++ b/tests/data/test-diff-filter/test1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(C1*)' has some indirect sub-type changes:
+  [C] 'function void bar(C1*)' has some indirect sub-type changes:
     parameter 1 of type 'C1*' has sub-type changes:
       in pointed to type 'class C1':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index fa489090..64969890 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test11-report.txt b/tests/data/test-diff-filter/test11-report.txt
index aee87235..c3b9672e 100644
--- a/tests/data/test-diff-filter/test11-report.txt
+++ b/tests/data/test-diff-filter/test11-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method int S1::member_fn0(S0&)' has some indirect sub-type changes:
+  [C] 'method int S1::member_fn0(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 8c815957..169771ec 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test14-0-report.txt b/tests/data/test-diff-filter/test14-0-report.txt
index 036b14d8..52cdcf89 100644
--- a/tests/data/test-diff-filter/test14-0-report.txt
+++ b/tests/data/test-diff-filter/test14-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test14-1-report.txt b/tests/data/test-diff-filter/test14-1-report.txt
index 003aae59..27df61a8 100644
--- a/tests/data/test-diff-filter/test14-1-report.txt
+++ b/tests/data/test-diff-filter/test14-1-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
           'unsigned int S::m2', at offset 64 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       referenced type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test15-0-report.txt b/tests/data/test-diff-filter/test15-0-report.txt
index 11739ca4..2c162d55 100644
--- a/tests/data/test-diff-filter/test15-0-report.txt
+++ b/tests/data/test-diff-filter/test15-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S* var1' was changed:
+  [C] 'S* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test15-1-report.txt b/tests/data/test-diff-filter/test15-1-report.txt
index 2dfc6a8e..82c6575c 100644
--- a/tests/data/test-diff-filter/test15-1-report.txt
+++ b/tests/data/test-diff-filter/test15-1-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S* var1' was changed:
+  [C] 'S* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 64 to 96 (in bits)
        1 data member insertion:
          'unsigned int S::m2', at offset 64 (in bits)
 
-  [C]'S* var2' was changed:
+  [C] 'S* var2' was changed:
     type of variable changed:
      pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test16-report-2.txt b/tests/data/test-diff-filter/test16-report-2.txt
index a7415e2a..744bdced 100644
--- a/tests/data/test-diff-filter/test16-report-2.txt
+++ b/tests/data/test-diff-filter/test16-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test16-report.txt b/tests/data/test-diff-filter/test16-report.txt
index 9c34fc4b..cf2bd81c 100644
--- a/tests/data/test-diff-filter/test16-report.txt
+++ b/tests/data/test-diff-filter/test16-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test17-0-report.txt b/tests/data/test-diff-filter/test17-0-report.txt
index df3624d2..2d2f8650 100644
--- a/tests/data/test-diff-filter/test17-0-report.txt
+++ b/tests/data/test-diff-filter/test17-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test17-1-report.txt b/tests/data/test-diff-filter/test17-1-report.txt
index 3bcb59e8..1c75796c 100644
--- a/tests/data/test-diff-filter/test17-1-report.txt
+++ b/tests/data/test-diff-filter/test17-1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            pointed to type 'struct S' changed; details are being reported
          and offset changed from 0 to 64 (in bits) (by +64 bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       referenced type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test18-report.txt b/tests/data/test-diff-filter/test18-report.txt
index 08e354fb..0d30ef39 100644
--- a/tests/data/test-diff-filter/test18-report.txt
+++ b/tests/data/test-diff-filter/test18-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test19-enum-report-1.txt b/tests/data/test-diff-filter/test19-enum-report-1.txt
index 19326c5b..337d9c35 100644
--- a/tests/data/test-diff-filter/test19-enum-report-1.txt
+++ b/tests/data/test-diff-filter/test19-enum-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(E)' has some indirect sub-type changes:
+  [C] 'function void foo(E)' has some indirect sub-type changes:
     parameter 1 of type 'typedef E' has sub-type changes:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index df2c9a06..87ef1a4d 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -7,14 +7,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(C1&)' has some indirect sub-type changes:
+  [C] 'function void bar(C1&)' has some indirect sub-type changes:
     parameter 1 of type 'C1&' has sub-type changes:
       in referenced type 'class C1':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
           'int C1::m1', at offset 32 (in bits)
 
-  [C]'function void foo(C0&)' has some indirect sub-type changes:
+  [C] 'function void foo(C0&)' has some indirect sub-type changes:
     parameter 1 of type 'C0&' has sub-type changes:
       in referenced type 'struct C0':
         type size changed from 16 to 24 (in bits)
diff --git a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
index 893ffd63..606c619d 100644
--- a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
+++ b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'const volatile S* const* const* var0' was changed to 'const volatile typedef_of_S* const* const* var0':
+  [C] 'const volatile S* const* const* var0' was changed to 'const volatile typedef_of_S* const* const* var0':
     type of variable changed:
      in pointed to type 'const volatile S* const* const':
        'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
diff --git a/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt b/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
index 77d6766c..bdbca052 100644
--- a/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
+++ b/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(const volatile S* const* const*)' has some indirect sub-type changes:
+  [C] 'function void func0(const volatile S* const* const*)' has some indirect sub-type changes:
     parameter 1 of type 'const volatile S* const* const*' changed:
       in pointed to type 'const volatile S* const* const':
         'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
diff --git a/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt b/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
index a624ef0f..f847d32e 100644
--- a/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
+++ b/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int add(int, int)' has some indirect sub-type changes:
+  [C] 'function int add(int, int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'float'
       type size hasn't changed
diff --git a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
index a961246c..85125410 100644
--- a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
+++ b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'S a[2]' was changed to 'typedef_of_S a[2]':
+  [C] 'S a[2]' was changed to 'typedef_of_S a[2]':
     type of variable changed:
      array element type 'struct S' changed: 
        entity changed from 'struct S' to compatible type 'typedef typedef_of_S'
diff --git a/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt b/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
index d6597ef7..8f96c202 100644
--- a/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
+++ b/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
index a213d7f9..dba30227 100644
--- a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
+++ b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
index 7c74f324..a226b6c5 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
+  [C] 'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
     parameter 1 of type 'ConstTypedefOfS*' has sub-type changes:
       in pointed to type 'typedef ConstTypedefOfS':
         underlying type 'const TypedefOfS' changed:
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
index 593cc1af..0f032cbd 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
+  [C] 'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
     parameter 1 of type 'ConstTypedefOfS*' has sub-type changes:
       in pointed to type 'typedef ConstTypedefOfS':
         underlying type 'const TypedefOfS' changed:
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
index a0615d05..7197c376 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
index 48003c42..cfbc7918 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S0::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
index 0c30b68a..eba592a2 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
@@ -16,7 +16,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S2':
         entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
index 857685f4..9e5fb48b 100644
--- a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
+++ b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(s*)' has some indirect sub-type changes:
+  [C] 'function void bar(s*)' has some indirect sub-type changes:
     parameter 1 of type 's*' has sub-type changes:
       in pointed to type 'class s':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
index 178ec737..11a44d5e 100644
--- a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
+++ b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
@@ -3,18 +3,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(s*)' has some indirect sub-type changes:
+  [C] 'function void bar(s*)' has some indirect sub-type changes:
     parameter 1 of type 's*' has sub-type changes:
       in pointed to type 'class s':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char s::m1', at offset 32 (in bits)
 
-  [C]'function void foo(s&)' has some indirect sub-type changes:
+  [C] 'function void foo(s&)' has some indirect sub-type changes:
     parameter 1 of type 's&' has sub-type changes:
       referenced type 'class s' changed, as reported earlier
 
-  [C]'method s::s(const s&)' has some indirect sub-type changes:
+  [C] 'method s::s(const s&)' has some indirect sub-type changes:
     'method s::s(const s&)' access changed from 'public' to 'private'
     parameter 1 of type 'const s&' has sub-type changes:
       in referenced type 'const s':
diff --git a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
index 60ee3766..a7ee9d55 100644
--- a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
+++ b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
@@ -3,18 +3,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(base&)' has some indirect sub-type changes:
+  [C] 'function void bar(base&)' has some indirect sub-type changes:
     parameter 1 of type 'base&' has sub-type changes:
       in referenced type 'struct base':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char base::m1', at offset 32 (in bits)
 
-  [C]'function void baz(base)' has some indirect sub-type changes:
+  [C] 'function void baz(base)' has some indirect sub-type changes:
     parameter 1 of type 'struct base' has sub-type changes:
       details were reported earlier
 
-  [C]'function void foo(inherited*)' has some indirect sub-type changes:
+  [C] 'function void foo(inherited*)' has some indirect sub-type changes:
     parameter 1 of type 'inherited*' has sub-type changes:
       in pointed to type 'struct inherited':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test3-report.txt b/tests/data/test-diff-filter/test3-report.txt
index c7c0a826..ef48956a 100644
--- a/tests/data/test-diff-filter/test3-report.txt
+++ b/tests/data/test-diff-filter/test3-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S&)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S&)' has some indirect sub-type changes:
     parameter 2 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 8 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index d35b958e..b78215b0 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133'
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc':
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry':
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor':
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 9bc76121..ccaf8126 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133' at liboffload_error_codes.h:38:1
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 2b6aaec1..44e78935 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133' at liboffload_error_codes.h:38:1
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
 
-  [C]'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 0x1 (in bytes)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 0x6 to 0x7
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index b106d946..795410dc 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -27,7 +27,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 2 functions with some indirect sub-type change:
 
-  [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
@@ -41,7 +41,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
-  [C]'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
+  [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
       type size hasn't changed
       1 enumerator deletion:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 89d6ca76..4ec08fea 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -27,7 +27,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 2 functions with some indirect sub-type change:
 
-  [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
@@ -41,7 +41,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
-  [C]'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:139:1 has some indirect sub-type changes:
+  [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:139:1 has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
       type size hasn't changed
       1 enumerator deletion:
diff --git a/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt b/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
index f8151035..69ed568c 100644
--- a/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
+++ b/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int bar(S*)' has some indirect sub-type changes:
+  [C] 'function int bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index f0f512df..c9cb9246 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -90,7 +90,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
@@ -212,7 +212,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133'
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc':
         type size hasn't changed
@@ -229,7 +229,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry':
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
@@ -243,7 +243,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor':
@@ -356,12 +356,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -420,7 +420,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 27653229..2f07f1a6 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -90,7 +90,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test36-report-0.txt b/tests/data/test-diff-filter/test36-report-0.txt
index 4815807c..08692c1e 100644
--- a/tests/data/test-diff-filter/test36-report-0.txt
+++ b/tests/data/test-diff-filter/test36-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function int foo_1(S*)' at test36-1-v1.c:12:1 has some indirect sub-type changes:
+  [C] 'function int foo_1(S*)' at test36-1-v1.c:12:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test36-1-v1.c:6:1:
         type size hasn't changed
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'function int foo_2(S*)' at test36-2-v1.c:13:1 has some indirect sub-type changes:
+  [C] 'function int foo_2(S*)' at test36-2-v1.c:13:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test36-2-v1.c:6:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test37-report-0.txt b/tests/data/test-diff-filter/test37-report-0.txt
index ca393b48..4617a505 100644
--- a/tests/data/test-diff-filter/test37-report-0.txt
+++ b/tests/data/test-diff-filter/test37-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void f1(A&)' at test37-v1.cc:19:1 has some indirect sub-type changes:
+  [C] 'function void f1(A&)' at test37-v1.cc:19:1 has some indirect sub-type changes:
     parameter 1 of type 'A&' has sub-type changes:
       in referenced type 'struct A' at test37-v1.cc:3:1:
         type size changed from 32 to 8 (in bits)
@@ -13,7 +13,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            type size changed from 32 to 8 (in bits)
 
 
-  [C]'function void f2(B&)' at test37-v1.cc:23:1 has some indirect sub-type changes:
+  [C] 'function void f2(B&)' at test37-v1.cc:23:1 has some indirect sub-type changes:
     parameter 1 of type 'B&' has sub-type changes:
       in referenced type 'struct B' at test37-v1.cc:8:1:
         type size changed from 32 to 8 (in bits)
@@ -23,7 +23,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            type size changed from 32 to 8 (in bits)
 
 
-  [C]'function void f3(C&)' at test37-v1.cc:27:1 has some indirect sub-type changes:
+  [C] 'function void f3(C&)' at test37-v1.cc:27:1 has some indirect sub-type changes:
     parameter 1 of type 'C&' has sub-type changes:
       in referenced type 'struct C' at test37-v1.cc:13:1:
         type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test39/test39-report-0.txt b/tests/data/test-diff-filter/test39/test39-report-0.txt
index b58eb8af..c6bfa2b1 100644
--- a/tests/data/test-diff-filter/test39/test39-report-0.txt
+++ b/tests/data/test-diff-filter/test39/test39-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function long long int foo1(container_type*)' at test39-b-v1.c:10:1 has some indirect sub-type changes:
+  [C] 'function long long int foo1(container_type*)' at test39-b-v1.c:10:1 has some indirect sub-type changes:
     parameter 1 of type 'container_type*' has sub-type changes:
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
 
 
-  [C]'function long long int foo2(container_type*)' at test39-c-v1.c:10:1 has some indirect sub-type changes:
+  [C] 'function long long int foo2(container_type*)' at test39-c-v1.c:10:1 has some indirect sub-type changes:
     parameter 1 of type 'container_type*' has sub-type changes:
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index 3a87adb5..cdae9c56 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -36,7 +36,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 2 functions with some indirect sub-type change:
 
-  [C]'method void abigail::xml_writer::write_context::record_type_as_emitted(const abigail::ir::type_base_sptr&)' at abg-writer.cc:473:1 has some indirect sub-type changes:
+  [C] 'method void abigail::xml_writer::write_context::record_type_as_emitted(const abigail::ir::type_base_sptr&)' at abg-writer.cc:473:1 has some indirect sub-type changes:
     parameter 1 of type 'const abigail::ir::type_base_sptr&' has sub-type changes:
       in referenced type 'const abigail::ir::type_base_sptr':
         in unqualified underlying type 'typedef abigail::ir::type_base_sptr' at abg-fwd.h:110:1:
@@ -47,7 +47,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             1 base class insertion:
               class std::tr1::__shared_ptr<abigail::ir::type_base, __gnu_cxx::_Lock_policy::_S_atomic> at shared_ptr.h:539:1
 
-  [C]'method bool abigail::xml_writer::write_context::type_ptr_cmp::operator()(const abigail::ir::type_base*, const abigail::ir::type_base*) const' at abg-writer.cc:359:1 has some indirect sub-type changes:
+  [C] 'method bool abigail::xml_writer::write_context::type_ptr_cmp::operator()(const abigail::ir::type_base*, const abigail::ir::type_base*) const' at abg-writer.cc:359:1 has some indirect sub-type changes:
 
 
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
index cc3b2678..a660fd3e 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int bar(S2*)' at test44-anonymous-data-member-v1.c:26:1 has some indirect sub-type changes:
+  [C] 'function int bar(S2*)' at test44-anonymous-data-member-v1.c:26:1 has some indirect sub-type changes:
     parameter 1 of type 'S2*' has sub-type changes:
       in pointed to type 'struct S2' at test44-anonymous-data-member-v1.c:11:1:
         type size changed from 128 to 160 (in bits)
diff --git a/tests/data/test-diff-filter/test6-report.txt b/tests/data/test-diff-filter/test6-report.txt
index 8ad408b8..ddf991f7 100644
--- a/tests/data/test-diff-filter/test6-report.txt
+++ b/tests/data/test-diff-filter/test6-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo()' has some indirect sub-type changes:
     return type changed:
       underlying type 'unsigned char' changed:
         type name changed from 'unsigned char' to 'unsigned int'
diff --git a/tests/data/test-diff-filter/test7-report.txt b/tests/data/test-diff-filter/test7-report.txt
index f71441ee..7e3a4d47 100644
--- a/tests/data/test-diff-filter/test7-report.txt
+++ b/tests/data/test-diff-filter/test7-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'return_type' to 'other_return_type'
       type size hasn't changed
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index a67ff59e..0699c146 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index 645324b5..fb67e43a 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -6,7 +6,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function void gl_h__glgentextures(const gdk__gl__gl_configs, const gl_h__gluint_vec___XUP)' at gl_h.adb:35:1 has some indirect sub-type changes:
+    [C] 'function void gl_h__glgentextures(const gdk__gl__gl_configs, const gl_h__gluint_vec___XUP)' at gl_h.adb:35:1 has some indirect sub-type changes:
       parameter 2 of type 'const gl_h__gluint_vec___XUP' has sub-type changes:
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
@@ -25,7 +25,7 @@
 
 
 
-    [C]'function gtk__glarea__gtk_glarea gtk__glarea__gtk_new(gtk__glarea__gtk_glarea, const gtk__glarea__attributes_array___XUP)' at gtk-glarea.adb:63:1 has some indirect sub-type changes:
+    [C] 'function gtk__glarea__gtk_glarea gtk__glarea__gtk_new(gtk__glarea__gtk_glarea, const gtk__glarea__attributes_array___XUP)' at gtk-glarea.adb:63:1 has some indirect sub-type changes:
       parameter 2 of type 'const gtk__glarea__attributes_array___XUP' has sub-type changes:
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
diff --git a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
index 736de8fb..8631497a 100644
--- a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/dirpkg-2-report-1.txt b/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
index c7c92265..c7c34702 100644
--- a/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
index e90a7e89..3bc01e14 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void foo(S1&)' has some indirect sub-type changes:
+    [C] 'function void foo(S1&)' has some indirect sub-type changes:
       parameter 1 of type 'S1&' has sub-type changes:
         in referenced type 'struct S1':
           type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
index bea69bad..5ed307f2 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void foo(S1&)' at obj-v0.cc:24:1 has some indirect sub-type changes:
+    [C] 'function void foo(S1&)' at obj-v0.cc:24:1 has some indirect sub-type changes:
       parameter 1 of type 'S1&' has sub-type changes:
         in referenced type 'struct S1' at obj-v0.cc:15:1:
           type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index 858967bb..0c097b6b 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -10,7 +10,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function IceConn IceAcceptConnection(IceListenObj, IceAcceptStatus*)' at accept.c:38:1 has some indirect sub-type changes:
+    [C] 'function IceConn IceAcceptConnection(IceListenObj, IceAcceptStatus*)' at accept.c:38:1 has some indirect sub-type changes:
       return type changed:
         underlying type '_IceConn*' changed:
           in pointed to type 'struct _IceConn' at ICEconn.h:131:1:
@@ -92,7 +92,7 @@
 
   2 Changed variables:
 
-    [C]'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1:
+    [C] 'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1:
       type of variable changed:
        array element type 'char*' changed: 
          in pointed to type 'char':
@@ -101,7 +101,7 @@
        type name changed from 'char*[1]' to 'const char*[1]'
        type size hasn't changed
 
-    [C]'_IceWatchProc* _IceWatchProcs' was changed at globals.h:39:1:
+    [C] '_IceWatchProc* _IceWatchProcs' was changed at globals.h:39:1:
       type of variable changed:
        in pointed to type 'struct _IceWatchProc' at ICElibint.h:322:1:
          entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index 662e2305..b3be1535 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function discmode_t mmc_get_dvd_struct_physical(const CdIo_t*, cdio_dvd_struct_t*)' at mmc.c:949:1 has some indirect sub-type changes:
+    [C] 'function discmode_t mmc_get_dvd_struct_physical(const CdIo_t*, cdio_dvd_struct_t*)' at mmc.c:949:1 has some indirect sub-type changes:
       parameter 2 of type 'cdio_dvd_struct_t*' has sub-type changes:
         in pointed to type 'typedef cdio_dvd_struct_t' at dvd.h:130:1:
           underlying type 'union {uint8_t type; cdio_dvd_physical_t physical; cdio_dvd_copyright_t copyright; cdio_dvd_disckey_t disckey; cdio_dvd_bca_t bca; cdio_dvd_manufact_t manufact;}' at dvd.h:122:1 changed:
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 385f9189..3819aed9 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -12,7 +12,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'method sigc::connection::connection(const sigc::connection&)' has some indirect sub-type changes:
+    [C] 'method sigc::connection::connection(const sigc::connection&)' has some indirect sub-type changes:
       parameter 1 of type 'const sigc::connection&' has sub-type changes:
         in referenced type 'const sigc::connection':
           in unqualified underlying type 'struct sigc::connection':
@@ -69,7 +69,7 @@
 
 
 
-    [C]'method sigc::internal::signal_impl* sigc::signal_base::impl() const' has some indirect sub-type changes:
+    [C] 'method sigc::internal::signal_impl* sigc::signal_base::impl() const' has some indirect sub-type changes:
       return type changed:
         in pointed to type 'struct sigc::internal::signal_impl':
           type size changed from 192 to 256 (in bits)
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index 9b78ca91..c227fa5c 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2199:1 has some indirect sub-type changes:
+    [C] 'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2199:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef SECOidTag' has sub-type changes:
         underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
           type size hasn't changed
@@ -28,7 +28,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function SSLKEAType NSS_FindCertKEAType(CERTCertificate*)' at sslcert.c:939:1 has some indirect sub-type changes:
+    [C] 'function SSLKEAType NSS_FindCertKEAType(CERTCertificate*)' at sslcert.c:939:1 has some indirect sub-type changes:
       return type changed:
         underlying type 'enum __anonymous_enum__' at sslt.h:38:1 changed:
           type size hasn't changed
@@ -39,7 +39,7 @@
             '__anonymous_enum__::ssl_kea_size' from value '5' to '6' at sslt.h:40:1
 
 
-    [C]'function SECStatus SSL_GetCipherSuiteInfo(PRUint16, SSLCipherSuiteInfo*, PRUintn)' at sslinfo.c:294:1 has some indirect sub-type changes:
+    [C] 'function SECStatus SSL_GetCipherSuiteInfo(PRUint16, SSLCipherSuiteInfo*, PRUintn)' at sslinfo.c:294:1 has some indirect sub-type changes:
       parameter 2 of type 'SSLCipherSuiteInfo*' has sub-type changes:
         in pointed to type 'typedef SSLCipherSuiteInfo' at sslt.h:252:1:
           underlying type 'struct SSLCipherSuiteInfoStr' at sslt.h:178:1 changed:
@@ -67,7 +67,7 @@
 
   1 Changed variable:
 
-    [C]'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
+    [C] 'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
       size of symbol changed from 148 to 138
       type of variable changed:
        type name changed from 'PRUint16[74]' to 'const PRUint16[69]'
@@ -83,7 +83,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:359:1 has some indirect sub-type changes:
+    [C] 'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:359:1 has some indirect sub-type changes:
       parameter 1 of type 'NSSCMSContentInfo*' has sub-type changes:
         in pointed to type 'typedef NSSCMSContentInfo' at cmst.h:54:1:
           underlying type 'struct NSSCMSContentInfoStr' at cmst.h:131:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
index 4fd91394..9251c43f 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
@@ -19,7 +19,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -47,7 +47,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
index 4fd91394..9251c43f 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
@@ -19,7 +19,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -47,7 +47,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index d1ef2674..b885629e 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -19,7 +19,7 @@
 
   6 functions with some indirect sub-type change:
 
-    [C]'function void spice_qxl_add_memslot(QXLInstance*, QXLDevMemSlot*)' at red_dispatcher.c:879:1 has some indirect sub-type changes:
+    [C] 'function void spice_qxl_add_memslot(QXLInstance*, QXLDevMemSlot*)' at red_dispatcher.c:879:1 has some indirect sub-type changes:
       parameter 1 of type 'QXLInstance*' has sub-type changes:
         in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
           underlying type 'struct QXLInstance' at spice.h:259:1 changed:
@@ -55,7 +55,7 @@
 
 
 
-    [C]'function int spice_server_add_client(SpiceServer*, int, int)' at reds.c:2391:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_add_client(SpiceServer*, int, int)' at reds.c:2391:1 has some indirect sub-type changes:
       parameter 1 of type 'SpiceServer*' has sub-type changes:
         in pointed to type 'typedef SpiceServer' at spice-server.h:38:1:
           underlying type 'struct RedsState' at reds-private.h:127:1 changed:
@@ -327,7 +327,7 @@
 
             no data member change (1 filtered);
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -355,7 +355,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)' at snd_worker.c:1081:1 has some indirect sub-type changes:
+    [C] 'function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)' at snd_worker.c:1081:1 has some indirect sub-type changes:
       parameter 1 of type 'SpicePlaybackInstance*' has sub-type changes:
         in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
           underlying type 'struct SpicePlaybackInstance' at spice.h:350:1 changed:
@@ -370,7 +370,7 @@
                    no data member changes (2 filtered);
 
 
-    [C]'function uint32_t spice_server_record_get_samples(SpiceRecordInstance*, uint32_t*, uint32_t)' at snd_worker.c:1331:1 has some indirect sub-type changes:
+    [C] 'function uint32_t spice_server_record_get_samples(SpiceRecordInstance*, uint32_t*, uint32_t)' at snd_worker.c:1331:1 has some indirect sub-type changes:
       parameter 1 of type 'SpiceRecordInstance*' has sub-type changes:
         in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
           underlying type 'struct SpiceRecordInstance' at spice.h:380:1 changed:
@@ -385,7 +385,7 @@
                    no data member changes (2 filtered);
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
index 42dc1a72..478fa263 100644
--- a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
+++ b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function int f(S*)' at foo.c:10:1 has some indirect sub-type changes:
+    [C] 'function int f(S*)' at foo.c:10:1 has some indirect sub-type changes:
       parameter 1 of type 'S*' has sub-type changes:
         in pointed to type 'struct S' at foo.c:3:1:
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
index 736de8fb..8631497a 100644
--- a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
index 91d3df9f..de24937a 100644
--- a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' at obj-v0.cc:16:1 has some indirect sub-type changes:
+    [C] 'function void bar(S&)' at obj-v0.cc:16:1 has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S' at obj-v0.cc:4:1:
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index dd58207a..69f438ea 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -26,7 +26,7 @@
 
   8 functions with some indirect sub-type change:
 
-    [C]'method void tbb::internal::concurrent_queue_base_v3::assign(const tbb::internal::concurrent_queue_base&)' at concurrent_queue.cpp:570:1 has some indirect sub-type changes:
+    [C] 'method void tbb::internal::concurrent_queue_base_v3::assign(const tbb::internal::concurrent_queue_base&)' at concurrent_queue.cpp:570:1 has some indirect sub-type changes:
       parameter 1 of type 'const tbb::internal::concurrent_queue_base&' has sub-type changes:
         in referenced type 'const tbb::internal::concurrent_queue_base':
           in unqualified underlying type 'typedef tbb::internal::concurrent_queue_base' at concurrent_queue.cpp:57:1:
@@ -55,7 +55,7 @@
 
 
 
-    [C]'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
+    [C] 'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
       parameter 1 of type 'enum tbb::internal::exception_id' has sub-type changes:
         type size hasn't changed
         1 enumerator insertion:
@@ -65,14 +65,14 @@
           'tbb::internal::exception_id::eid_max' from value '20' to '21' at tbb_exception.h:79:1
 
 
-    [C]'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
+    [C] 'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::mutex&' has sub-type changes:
         in referenced type 'class tbb::mutex' at mutex.h:40:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
+    [C] 'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
       parameter 2 of type 'tbb::task_group_context&' has sub-type changes:
         in referenced type 'class tbb::task_group_context' at task.h:302:1:
           type size hasn't changed
@@ -203,28 +203,28 @@
                 '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
 
 
-    [C]'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_mutex' at queuing_mutex.h:45:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_rw_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_rw_mutex' at queuing_rw_mutex.h:47:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
+    [C] 'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::recursive_mutex&' has sub-type changes:
         in referenced type 'class tbb::recursive_mutex' at recursive_mutex.h:39:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method bool tbb::spin_mutex::scoped_lock::internal_try_acquire(tbb::spin_mutex&)' at spin_mutex.h:69:1 has some indirect sub-type changes:
+    [C] 'method bool tbb::spin_mutex::scoped_lock::internal_try_acquire(tbb::spin_mutex&)' at spin_mutex.h:69:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::spin_mutex&' has sub-type changes:
         referenced type 'class tbb::spin_mutex' changed at spin_mutex.h:47:1, as reported earlier
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 26ab7c05..de74f1c5 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -26,7 +26,7 @@
 
   7 functions with some indirect sub-type change:
 
-    [C]'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
+    [C] 'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
       parameter 1 of type 'enum tbb::internal::exception_id' has sub-type changes:
         type size hasn't changed
         1 enumerator insertion:
@@ -36,14 +36,14 @@
           'tbb::internal::exception_id::eid_max' from value '20' to '21' at tbb_exception.h:79:1
 
 
-    [C]'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
+    [C] 'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::mutex&' has sub-type changes:
         in referenced type 'class tbb::mutex' at mutex.h:40:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
+    [C] 'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
       parameter 2 of type 'tbb::task_group_context&' has sub-type changes:
         in referenced type 'class tbb::task_group_context' at task.h:302:1:
           type size hasn't changed
@@ -56,28 +56,28 @@
              array type subrange 1 changed length from 80 to 72
 
 
-    [C]'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_mutex' at queuing_mutex.h:45:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_rw_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_rw_mutex' at queuing_rw_mutex.h:47:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
+    [C] 'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::recursive_mutex&' has sub-type changes:
         in referenced type 'class tbb::recursive_mutex' at recursive_mutex.h:39:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::spin_mutex::scoped_lock::internal_acquire(tbb::spin_mutex&)' at spin_mutex.h:66:1 has some indirect sub-type changes:
+    [C] 'method void tbb::spin_mutex::scoped_lock::internal_acquire(tbb::spin_mutex&)' at spin_mutex.h:66:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::spin_mutex&' has sub-type changes:
         in referenced type 'class tbb::spin_mutex' at spin_mutex.h:40:1:
           type size hasn't changed
diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt b/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
index 9ba2b126..1bd9abb0 100644
--- a/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
+++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
@@ -6,7 +6,7 @@ SONAME changed from 'test48-soname-abixml-v0' to 'test48-soname-abixml-v1'
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S*)' at test48-soname-abixml-v1.c:8:1 has some indirect sub-type changes:
+  [C] 'function void foo(S*)' at test48-soname-abixml-v1.c:8:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test48-soname-abixml-v1.c:1:1:
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
index 7ca965b5..d3ac0320 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(b_type*)' has some indirect sub-type changes:
+  [C] 'function void bar(b_type*)' has some indirect sub-type changes:
     parameter 1 of type 'b_type*' has sub-type changes:
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function void foo(a_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(a_type*)' has some indirect sub-type changes:
     parameter 1 of type 'a_type*' has sub-type changes:
       in pointed to type 'typedef a_type':
         underlying type 'struct a_type' changed:
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
index 66ecc1cb..e9a14b00 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(b_type*)' has some indirect sub-type changes:
+  [C] 'function void bar(b_type*)' has some indirect sub-type changes:
     parameter 1 of type 'b_type*' has sub-type changes:
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt b/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
index faaecb89..8f5d0b6b 100644
--- a/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int, int)' has some indirect sub-type changes:
+  [C] 'function int foo(int, int)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'float'
       type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt b/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
index dc196bc4..f3c4c1d9 100644
--- a/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
+++ b/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 8 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt b/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
index 38d69388..c92f1f34 100644
--- a/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
+++ b/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt b/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
index 38d69388..c92f1f34 100644
--- a/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
+++ b/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
index c70a653b..754409ca 100644
--- a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
+++ b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
       details were reported earlier
 
diff --git a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
index 0b59f208..46c078c0 100644
--- a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
+++ b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
index 215e41b6..40b936fc 100644
--- a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
+++ b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
index 7d880737..f351bc58 100644
--- a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
+++ b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void baz(S*)' has some indirect sub-type changes:
+  [C] 'function void baz(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 53e0a860..70ec5a75 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
index be4a923e..eb8df613 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 53e0a860..70ec5a75 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index 484d7fa1..e64a5b55 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
index 7f33158d..2c085a78 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index e903a1a2..80012c1e 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index 1c0df326..fa1d882f 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
index 112dc702..2cb7afd9 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) variab
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index 1c0df326..fa1d882f 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index 0eee865c..47fe3d83 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
index 41d859cd..f235ac30 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed (1 filtered out), 1 Changed, 0 Added variab
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index 0eee865c..47fe3d83 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
index 5e65d5a3..0de2e7cf 100644
--- a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(C&)' has some indirect sub-type changes:
+  [C] 'function void bar(C&)' has some indirect sub-type changes:
     parameter 1 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
index 3e7b00be..75274e00 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void __private_function(S*)' has some indirect sub-type changes:
+  [C] 'function void __private_function(S*)' has some indirect sub-type changes:
     Please note that the symbol of this function is function1@VERSION_1.0
      and it aliases symbols: __private_function@PRIVATE_1.0, function2@VERSION_1.0
     parameter 1 of type 'S*' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
index 3e7b00be..75274e00 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void __private_function(S*)' has some indirect sub-type changes:
+  [C] 'function void __private_function(S*)' has some indirect sub-type changes:
     Please note that the symbol of this function is function1@VERSION_1.0
      and it aliases symbols: __private_function@PRIVATE_1.0, function2@VERSION_1.0
     parameter 1 of type 'S*' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test24-soname-report-1.txt b/tests/data/test-diff-suppr/test24-soname-report-1.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-1.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-10.txt b/tests/data/test-diff-suppr/test24-soname-report-10.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-10.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-10.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-12.txt b/tests/data/test-diff-suppr/test24-soname-report-12.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-12.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-12.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-14.txt b/tests/data/test-diff-suppr/test24-soname-report-14.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-14.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-14.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-16.txt b/tests/data/test-diff-suppr/test24-soname-report-16.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-16.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-16.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-4.txt b/tests/data/test-diff-suppr/test24-soname-report-4.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-4.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test25-typedef-report-0.txt b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
index 61c6748e..6d2ba155 100644
--- a/tests/data/test-diff-suppr/test25-typedef-report-0.txt
+++ b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(Type*)' has some indirect sub-type changes:
+  [C] 'function void bar(Type*)' has some indirect sub-type changes:
     parameter 1 of type 'Type*' has sub-type changes:
       in pointed to type 'typedef Type':
         underlying type 'struct PrivateType0' changed:
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 data member insertion:
             'char PrivateType0::m1', at offset 32 (in bits)
 
-  [C]'function void baz(TypePtr)' has some indirect sub-type changes:
+  [C] 'function void baz(TypePtr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef TypePtr' has sub-type changes:
       underlying type 'PrivateType1*' changed:
         in pointed to type 'struct PrivateType1':
diff --git a/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt b/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
index ec620dcf..a06d0413 100644
--- a/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(S*)' has some indirect sub-type changes:
+  [C] 'function void func0(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt b/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
index ec620dcf..a06d0413 100644
--- a/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(S*)' has some indirect sub-type changes:
+  [C] 'function void func0(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-3.txt b/tests/data/test-diff-suppr/test29-soname-report-3.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-3.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-6.txt b/tests/data/test-diff-suppr/test29-soname-report-6.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-6.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-6.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-8.txt b/tests/data/test-diff-suppr/test29-soname-report-8.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-8.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-8.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
index 799dc6fa..ebd3b6ea 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
index 5b36215a..93fa56e1 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 2 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
index e1229701..3cf04629 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index cf413ce3..be32d3f7 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -13,11 +13,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'method virtual int non_defined_class::virtual_func0()' at test30-priv-lib-v1.h:15:1 has some indirect sub-type changes:
+  [C] 'method virtual int non_defined_class::virtual_func0()' at test30-priv-lib-v1.h:15:1 has some indirect sub-type changes:
     the vtable offset of method virtual int non_defined_class::virtual_func0() changed from 3 to 4
       note that this is an ABI incompatible change to the vtable of class non_defined_class
 
-  [C]'function int public_function(S*)' at test30-pub-lib-v1.cc:22:1 has some indirect sub-type changes:
+  [C] 'function int public_function(S*)' at test30-pub-lib-v1.cc:22:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test31-report-1.txt b/tests/data/test-diff-suppr/test31-report-1.txt
index a2deb146..cad99541 100644
--- a/tests/data/test-diff-suppr/test31-report-1.txt
+++ b/tests/data/test-diff-suppr/test31-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void hidden::foo(hidden::S0&)' has some indirect sub-type changes:
+  [C] 'function void hidden::foo(hidden::S0&)' has some indirect sub-type changes:
     parameter 1 of type 'hidden::S0&' has sub-type changes:
       in referenced type 'struct hidden::S0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-0.txt b/tests/data/test-diff-suppr/test32-report-0.txt
index 2eea3328..3dc192f6 100644
--- a/tests/data/test-diff-suppr/test32-report-0.txt
+++ b/tests/data/test-diff-suppr/test32-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void priv::foo()' has some indirect sub-type changes:
+  [C] 'function void priv::foo()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'int'
       type size changed from 0 to 32 (in bits)
 
-  [C]'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-1.txt b/tests/data/test-diff-suppr/test32-report-1.txt
index 7e260378..7b0fbd44 100644
--- a/tests/data/test-diff-suppr/test32-report-1.txt
+++ b/tests/data/test-diff-suppr/test32-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test33-report-0.txt b/tests/data/test-diff-suppr/test33-report-0.txt
index 2dc61e8f..5807f845 100644
--- a/tests/data/test-diff-suppr/test33-report-0.txt
+++ b/tests/data/test-diff-suppr/test33-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(to_keep&)' has some indirect sub-type changes:
+  [C] 'function void bar(to_keep&)' has some indirect sub-type changes:
     parameter 1 of type 'to_keep&' has sub-type changes:
       in referenced type 'class to_keep':
         type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt b/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
index 21995e0c..06d04b98 100644
--- a/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
+++ b/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(StructType*)' at test39-opaque-type-v1.c:20:1 has some indirect sub-type changes:
+  [C] 'function void bar(StructType*)' at test39-opaque-type-v1.c:20:1 has some indirect sub-type changes:
     parameter 1 of type 'StructType*' changed:
       in pointed to type 'typedef StructType' at test39-header-v1.h:2:1:
         typedef name changed from StructType to AnotherStructType at test39-header-v1.h:2:1
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
index 09642c52..3484c052 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
     parameter 1 of type 'public_type*' has sub-type changes:
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
index 1f2b6de8..e051f750 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
     parameter 1 of type 'public_type*' has sub-type changes:
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt b/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
index 57399c5b..4b1681bc 100644
--- a/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
+++ b/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(EnumType1)' at test41-enumerator-changes-v1.cc:24:1 has some indirect sub-type changes:
+  [C] 'function void bar(EnumType1)' at test41-enumerator-changes-v1.cc:24:1 has some indirect sub-type changes:
     parameter 1 of type 'enum EnumType1' has sub-type changes:
       type size hasn't changed
       1 enumerator insertion:
@@ -13,7 +13,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         'EnumType1::eenum_count' from value '3' to '4' at test41-enumerator-changes-v1.cc:10:1
 
 
-  [C]'function void foo(EnumType0)' at test41-enumerator-changes-v1.cc:20:1 has some indirect sub-type changes:
+  [C] 'function void foo(EnumType0)' at test41-enumerator-changes-v1.cc:20:1 has some indirect sub-type changes:
     parameter 1 of type 'enum EnumType0' has sub-type changes:
       type size hasn't changed
       1 enumerator insertion:
diff --git a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
index a73ca078..601d4f8d 100644
--- a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
+++ b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
+  [C] 'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
     parameter 1 of type 'struct type_to_keep' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
index a73ca078..601d4f8d 100644
--- a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
+++ b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
+  [C] 'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
     parameter 1 of type 'struct type_to_keep' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
index 381c583c..30b79879 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       details were reported earlier
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
index ff63af68..ca57bbbb 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
index d2a6de47..2c08c142 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' at test6-fn-suppr-v1.cc:48:1 has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' at test6-fn-suppr-v1.cc:48:1 has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1' at test6-fn-suppr-v1.cc:23:1:
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function int bar(S&)' at test6-fn-suppr-v1.cc:42:1 has some indirect sub-type changes:
+  [C] 'function int bar(S&)' at test6-fn-suppr-v1.cc:42:1 has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S' at test6-fn-suppr-v1.cc:14:1:
         type size changed from 32 to 64 (in bits)
@@ -21,7 +21,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' at test6-fn-suppr-v1.cc:52:1 has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' at test6-fn-suppr-v1.cc:52:1 has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2' at test6-fn-suppr-v1.cc:32:1:
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
index e0ffc2c0..32e1d239 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function int bar(S&)' has some indirect sub-type changes:
+  [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
@@ -21,7 +21,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
index 5f27ff97..5633bed5 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 0 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         size changed from 32 to 64 bits
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32
 
-  [C]'function int bar(S&)' has some indirect sub-type changes:
+  [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 0 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
index bff11e5f..7fd8502c 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
        1 data member change:
         'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
index b444010d..d4d86310 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
index b444010d..d4d86310 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
index bff11e5f..7fd8502c 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
        1 data member change:
         'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt b/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
index 215e41b6..40b936fc 100644
--- a/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt b/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
index bb0cc78c..1582fffc 100644
--- a/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
+++ b/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt b/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt b/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
+++ b/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
-- 
2.25.0.265.gbab2e86ba0-goog

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] Add space missing between "[C]" tag and description of changed item.
  2020-01-01  0:00 [PATCH 1/2] Add space missing between "[C]" tag and description of changed item Giuliano Procida via libabigail
@ 2020-01-01  0:00 ` Dodji Seketeli
  2020-01-01  0:00 ` [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C] Giuliano Procida via libabigail
  1 sibling, 0 replies; 7+ messages in thread
From: Dodji Seketeli @ 2020-01-01  0:00 UTC (permalink / raw)
  To: Giuliano Procida; +Cc: libabigail, kernel-team

Hello Giuliano,

Giuliano Procida <gprocida@google.com> a écrit:

> All such tags are now followed by a space and are more readable.
>
> 	* src/abg-default-reporter.cc (report(corpus_diff)): Output
> 	space after "[C]".
> 	* src/abg-leaf-reporter.cc (report(corpus_diff)): Output space
> 	after "[C]"
> 	* tests/data/test-*/*report*.txt: Update all the test
> 	reports.

This looks goods to me so I have pushed it to master.

I have just edited the ChangeLog part of the commit log message to make
it comply wih the existing ChangeLog entries.  It now looks like:

------------------------>8<-------------------------
Add space missing between "[C]" tag and description of changed item.

All such tags are now followed by a space and are more readable.

	* src/abg-default-reporter.cc (report): In the overload for
	corpus_diff, output space after "[C]".
	* src/abg-leaf-reporter.cc (report): Likewise.
	* tests/data/test-*/*report*.txt: Update all the test
	reports.
------------------------>8<-------------------------

Thanks!!

Cheers,

-- 
		Dodji

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/2 v3] Tag add/remove/change lines unconditionally with [A],  [D], [C].
  2020-01-01  0:00   ` [PATCH 2/2 v2] " Giuliano Procida via libabigail
@ 2020-03-17 13:19     ` Giuliano Procida
  2020-03-18 14:27       ` Dodji Seketeli
  0 siblings, 1 reply; 7+ messages in thread
From: Giuliano Procida @ 2020-03-17 13:19 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida

These tags were previously only emitted by the default reporter if the
there were more than 100 (hard-coded constant) items in a a list. The
leaf reporter emitted them unconditionally. This change simplifies the
code, makes output more consistent and makes it easier to interpret
diffs of diff output.

Additionally, in the reporting of changed unreachable types, the
indentation and quoting for the deleted and added cases was missing.
This patch corrects these issues.

Finally, when doing package differences, there were no tags for
deleted/added binaries. This patch adds them.

	* src/abg-default-reporter.cc (report): In the corpus_diff
	override, remove calculations of number of changes (total) and
	comparisons against arbitrary threshold (large_num); emit [A],
	[D], [C] tags unconditionally.
	* src/abg-reporter-priv.cc
	(maybe_report_unreachable_type_changes): Remove comparisons of
	number of changes against arbitrary threshold (large_num);
	emit [A], [D], [C] tags unconditionally; fix quoting of
        deleted unreachable types; fix indentation of changed
	unreachable types.
	* tools/abipkgdiff.cc (compare_prepared_userspace_packages):
	Emit [D] and [A] tags for removed and added binaries.
	* tests/data/test-*/*report*.txt: In 109 report files, add
        tags [A], [D], [C] tags and correct some indentation and
        quoting.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-default-reporter.cc                   |  33 +-
 src/abg-reporter-priv.cc                      |  18 +-
 .../test1-fn-removed-report-0.txt             |   2 +-
 .../test2-var-removed-report-0.txt            |   2 +-
 .../test3-fn-removed-report-0.txt             |   2 +-
 .../test2-filtered-removed-fns-report0.txt    |   2 +-
 .../test-abidiff/test-PR18791-report0.txt     |   4 +-
 .../PR25058-liblttng-ctl-report-1.txt         |   6 +-
 tests/data/test-diff-dwarf/test0-report.txt   |   2 +-
 .../test16-syms-only-report.txt               |   2 +-
 .../test17-non-refed-syms-report-0.txt        |   2 +-
 .../test18-alias-sym-report-0.txt             |   2 +-
 .../test19-soname-report-0.txt                |   2 +-
 .../test28-vtable-changes-report-0.txt        |  10 +-
 .../test29-vtable-changes-report-0.txt        |   2 +-
 .../test30-vtable-changes-report-0.txt        |   2 +-
 .../test31-vtable-changes-report-0.txt        |   2 +-
 .../test32-fnptr-changes-report-0.txt         |   4 +-
 .../test33-fnref-changes-report-0.txt         |   4 +-
 .../test42-PR21296-clanggcc-report0.txt       |   2 +-
 tests/data/test-diff-dwarf/test7-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test9-report.txt   |   2 +-
 tests/data/test-diff-filter/test0-report.txt  |   2 +-
 tests/data/test-diff-filter/test01-report.txt |   2 +-
 tests/data/test-diff-filter/test10-report.txt |   4 +-
 tests/data/test-diff-filter/test12-report.txt |   2 +-
 tests/data/test-diff-filter/test13-report.txt |   2 +-
 tests/data/test-diff-filter/test2-report.txt  |   2 +-
 .../test30-pr18904-rvalueref-report0.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report1.txt      | 282 +++++++++---------
 .../test30-pr18904-rvalueref-report2.txt      | 282 +++++++++---------
 .../test31-pr18535-libstdc++-report-0.txt     |  38 +--
 .../test31-pr18535-libstdc++-report-1.txt     |  38 +--
 .../test35-pr18754-no-added-syms-report-0.txt | 272 ++++++++---------
 .../test35-pr18754-no-added-syms-report-1.txt | 178 +++++------
 .../data/test-diff-filter/test41-report-0.txt |  50 ++--
 tests/data/test-diff-filter/test9-report.txt  |   4 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  24 +-
 .../PR24690/PR24690-report-0.txt              |  46 +--
 ...bus-glib-0.104-3.fc23.armv7hl-report-0.txt |  18 +-
 ....el7.x86_64-multiple-sym-vers-report-0.txt |   8 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |   8 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |   4 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |   4 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |   2 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-0.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-1.txt |  18 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |  18 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt | 124 ++++----
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt | 124 ++++----
 .../data/test-diff-pkg/test-rpm-report-0.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-1.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-2.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-3.txt  |  22 +-
 .../data/test-diff-pkg/test-rpm-report-5.txt  |   4 +-
 .../test15-suppr-added-fn-report-0.txt        |   2 +-
 .../test15-suppr-added-fn-report-2.txt        |   2 +-
 .../test15-suppr-added-fn-report-5.txt        |   2 +-
 .../test16-suppr-removed-fn-report-0.txt      |   2 +-
 .../test16-suppr-removed-fn-report-3.txt      |   2 +-
 .../test16-suppr-removed-fn-report-5.txt      |   2 +-
 .../test17-suppr-added-var-report-0.txt       |   2 +-
 .../test17-suppr-added-var-report-3.txt       |   2 +-
 .../test17-suppr-added-var-report-5.txt       |   2 +-
 .../test18-suppr-removed-var-report-0.txt     |   2 +-
 .../test18-suppr-removed-var-report-3.txt     |   2 +-
 .../test18-suppr-removed-var-report-5.txt     |   2 +-
 .../test19-suppr-added-fn-sym-report-0.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-3.txt    |   2 +-
 .../test19-suppr-added-fn-sym-report-5.txt    |   2 +-
 .../test20-suppr-removed-fn-sym-report-0.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-1.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-2.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-3.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-4.txt  |   6 +-
 .../test20-suppr-removed-fn-sym-report-5.txt  |   6 +-
 .../test21-suppr-added-var-sym-report-0.txt   |   4 +-
 .../test21-suppr-added-var-sym-report-1.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-2.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-3.txt   |   2 +-
 .../test21-suppr-added-var-sym-report-4.txt   |   2 +-
 .../test22-suppr-removed-var-sym-report-0.txt |   6 +-
 .../test22-suppr-removed-var-sym-report-1.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-2.txt |   2 +-
 .../test22-suppr-removed-var-sym-report-3.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-4.txt |   4 +-
 .../test22-suppr-removed-var-sym-report-5.txt |   2 +-
 .../test27-add-aliased-function-report-0.txt  |   2 +-
 .../test27-add-aliased-function-report-3.txt  |   2 +-
 .../test27-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-0.txt  |   2 +-
 .../test28-add-aliased-function-report-1.txt  |   2 +-
 .../test28-add-aliased-function-report-2.txt  |   2 +-
 .../test28-add-aliased-function-report-4.txt  |   2 +-
 .../test28-add-aliased-function-report-5.txt  |   2 +-
 .../data/test-diff-suppr/test30-report-0.txt  |   4 +-
 ...t44-suppr-sym-name-not-regexp-report-1.txt |   4 +-
 .../test47-non-reachable-types-report-1.txt   |   6 +-
 .../test47-non-reachable-types-report-2.txt   |   4 +-
 .../test47-non-reachable-types-report-3.txt   |   4 +-
 .../test47-non-reachable-types-report-4.txt   |   4 +-
 .../test47-non-reachable-types-report-7.txt   |   6 +-
 ...0-from-fc20-to-fc23-dbus-glib-report-0.txt |  22 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ....fc20--dbus-glib-0.106-1.fc23-report-0.txt |  22 +-
 ...--dbus-glib-0.106-1.fc23.i686-report-0.txt |  14 +-
 ...-glib-0.106-1.fc23.x86_64.rpm-report-0.txt |   8 +-
 ...dbus-glib-0.106-1.fc23.x86_64-report-0.txt |   8 +-
 ...s-util-3.24.0-2.0.fc25.x86_64-report-0.txt |  74 ++---
 ...-vte291-0.39.90-1.fc22.x86_64-report-0.txt |   8 +-
 tools/abipkgdiff.cc                           |   4 +-
 112 files changed, 1174 insertions(+), 1201 deletions(-)

diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 834a664f..e6aba3e5 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1752,10 +1752,6 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	<< d.second_corpus()->get_architecture_name() << "'\n\n";
 
   /// Report removed/added/changed functions.
-  size_t total = s.net_num_func_removed() + s.net_num_func_added() +
-    s.net_num_func_changed();
-  const unsigned large_num = 100;
-
   if (ctxt->show_deleted_fns())
     {
       if (s.net_num_func_removed() == 1)
@@ -1776,8 +1772,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'" << (*i)->get_pretty_representation() << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -1823,8 +1818,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  out
 	    << indent
 	    << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'"
 	      << (*i)->get_pretty_representation()
 	      << "'";
@@ -1935,10 +1929,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	out << "\n";
     }
 
-  // Report added/removed/changed variables.
-  total = s.num_vars_removed() + s.num_vars_added() +
-    s.num_vars_changed() - s.num_changed_vars_filtered_out();
-
+  // Report removed/added/changed variables.
   if (ctxt->show_deleted_vars())
     {
       if (s.net_num_vars_removed() == 1)
@@ -1962,8 +1953,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 	  out << "'"
 	      << n
 	      << "'";
@@ -2004,8 +1994,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 
 	  out << indent
 	      << "  ";
-	  if (total > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  out << "'" << n << "'";
 	  if (ctxt->show_linkage_names())
 	    {
@@ -2087,8 +2076,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_removed_func_syms() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.first_corpus()->get_fun_symbol_map());
@@ -2125,8 +2113,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_func_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "",
 					**i,
 					d.second_corpus()->get_fun_symbol_map());
@@ -2162,8 +2149,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.num_var_syms_removed() > large_num)
-	    out << "[D] ";
+	  out << "[D] ";
 
 	  show_linkage_name_and_aliases
 	    (out, "", **i,
@@ -2202,8 +2188,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	    continue;
 
 	  out << indent << "  ";
-	  if (s.net_num_added_var_syms() > large_num)
-	    out << "[A] ";
+	  out << "[A] ";
 	  show_linkage_name_and_aliases(out, "", **i,
 					d.second_corpus()->get_fun_symbol_map());
 	  out << "\n";
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 7c452877..f1b6e5e3 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -1218,7 +1218,6 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
 				      const string& indent,
 				      ostream& out)
 {
-  const unsigned large_num = 100;
   const diff_context_sptr& ctxt = d.context();
 
   if (!(ctxt->show_unreachable_types()
@@ -1250,10 +1249,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
       if (d.priv_->deleted_unreachable_type_is_suppressed((*i).get()))
 	continue;
 
-      out << indent << "  ";
-      if (s.num_removed_unreachable_types() > large_num)
-	out << "[D] ";
-      out << get_pretty_representation(*i);
+      out << indent << "  [D] '" << get_pretty_representation(*i) << "'";
       report_loc_info(*i, *ctxt, out);
       out << "\n";
       emitted = true;
@@ -1287,12 +1283,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
 
       string repr = diff->first_subject()->get_pretty_representation();
 
-      out << "  ";
-
-      if (sorted_diff_sptrs.size() > large_num)
-	out << "[C] ";
-
-      out << "'" << repr << "' changed:\n";
+      out << indent << "  [C] '" << repr << "' changed:\n";
       diff->report(out, indent + "    ");
       out << "\n";
       emitted = true;
@@ -1324,10 +1315,7 @@ maybe_report_unreachable_type_changes(const corpus_diff& d,
       if (d.priv_->added_unreachable_type_is_suppressed((*i).get()))
 	continue;
 
-      out << indent << "  ";
-      if (s.num_added_unreachable_types() > large_num)
-	out << "[A] ";
-      out << "'" << get_pretty_representation(*i) << "'";
+      out << indent << "  [A] '" << get_pretty_representation(*i) << "'";
       report_loc_info(*i, *ctxt, out);
       out << "\n";
       emitted = true;
diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
index bd8560de..e957129f 100644
--- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt
@@ -4,5 +4,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fun2()'    {_Z4fun2v}
+  [D] 'function void fun2()'    {_Z4fun2v}
 
diff --git a/tests/data/test-abicompat/test2-var-removed-report-0.txt b/tests/data/test-abicompat/test2-var-removed-report-0.txt
index c407f2d1..eba61773 100644
--- a/tests/data/test-abicompat/test2-var-removed-report-0.txt
+++ b/tests/data/test-abicompat/test2-var-removed-report-0.txt
@@ -4,5 +4,5 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed variable:
 
-  'int global_var1'    {global_var1}
+  [D] 'int global_var1'    {global_var1}
 
diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
index 63d5d2e8..e8eaf4b3 100644
--- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt
+++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt
@@ -4,5 +4,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
+  [D] 'function void _internal_fun1()'    {_Z4fun1v@@VERSION_1.0}
 
diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
index bd34dbf5..6640a6dd 100644
--- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
+++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void to_erase()'    {to_erase}
+  [D] 'function void to_erase()'    {to_erase}
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 8570a984..ebf1e606 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 1 Added function:
 
-  'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
+  [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'
 
 17 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index 088a0970..725619ab 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -352,7 +352,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 3 Added variables:
 
-  'const char* const mi_lttng_element_command_disable_rotation'
-  'const char* const mi_lttng_element_command_enable_rotation'
-  'const char* const mi_lttng_element_command_rotate'
+  [A] 'const char* const mi_lttng_element_command_disable_rotation'
+  [A] 'const char* const mi_lttng_element_command_enable_rotation'
+  [A] 'const char* const mi_lttng_element_command_rotate'
 
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index cad7ac78..03ce0f6a 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test16-syms-only-report.txt b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-dwarf/test16-syms-only-report.txt
+++ b/tests/data/test-diff-dwarf/test16-syms-only-report.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
index 0ec84a24..f87f7a23 100644
--- a/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test17-non-refed-syms-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  bar
+  [A] bar
 
diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
index b3eb66d2..9683d745 100644
--- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
+++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'
+  [A] 'function void bar()'
 
diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
index aed9009f..45df5856 100644
--- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt
+++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
@@ -6,5 +6,5 @@ SONAME changed from 'libtest19-soname-0' to 'libtest19-soname-1'
 
 1 Added function:
 
-  'function void func1()'
+  [A] 'function void func1()'
 
diff --git a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
index 361781a1..6f015fc8 100644
--- a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 2 Added functions:
 
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
-  'method virtual S::~S(int)'
+  [A] 'method virtual S::~S(int)'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
@@ -19,7 +19,7 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 3 Added variable symbols not referenced by debug info:
 
-  _ZTI1S
-  _ZTS1S
-  _ZTV1S
+  [A] _ZTI1S
+  [A] _ZTS1S
+  [A] _ZTV1S
 
diff --git a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
index fc80348a..423ddbee 100644
--- a/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test29-vtable-changes-report-0.txt
@@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fn1()'
+  [A] 'method virtual void S::fn1()'
     note that this adds a new entry to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
index 6b0f772c..4153952e 100644
--- a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method virtual void S::fvtable_breaker()'
+  [A] 'method virtual void S::fvtable_breaker()'
     note that this adds a new entry to the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
index 5402280e..a36122c1 100644
--- a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual void S::fn0()'
+  [D] 'method virtual void S::fn0()'
     note that this removes an entry from the vtable of struct S
 
 1 function with some indirect sub-type change:
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 51b3920b..12138725 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(callback)'
+  [D] 'function void fn2(callback)'
 
 1 Added function:
 
-  'function void fn2(callback)'
+  [A] 'function void fn2(callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index c8da7868..61322086 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void fn2(const callback)'
+  [D] 'function void fn2(const callback)'
 
 1 Added function:
 
-  'function void fn2(const callback)'
+  [A] 'function void fn2(const callback)'
 
 3 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
index 44918baa..71a2cc3a 100644
--- a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
+++ b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
+  [D] 'method void std::_Tuple_impl<1ul>::_Tuple_impl()'
 
 11 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test7-report.txt b/tests/data/test-diff-dwarf/test7-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-dwarf/test7-report.txt
+++ b/tests/data/test-diff-dwarf/test7-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 8ee5a975..5069e8ab 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 01814b45..3d7dbb1c 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'unsigned int global_var2'
+  [A] 'unsigned int global_var2'
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 6967ee31..bb42e471 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index ff759af7..a208f2e0 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method int S0::get_member0() const'
+  [A] 'method int S0::get_member0() const'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index 5a505fc3..9b798f73 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Removed functions:
 
-  'method S::S()'
-  'method int S::mem_fn2()'
+  [D] 'method S::S()'
+  [D] 'method int S::mem_fn2()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test12-report.txt b/tests/data/test-diff-filter/test12-report.txt
index b7f56302..9fe7a521 100644
--- a/tests/data/test-diff-filter/test12-report.txt
+++ b/tests/data/test-diff-filter/test12-report.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 1 Added variable
 
 1 Added variable:
 
-  'static char S::m0'
+  [A] 'static char S::m0'
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 6a0f152a..a4582051 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method B1::B1()'
+  [A] 'method B1::B1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index 78a3c9d3..e9c040ff 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'method C0::C0()'
+  [A] 'method C0::C0()'
 
 2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index 678c9f61..a368fe69 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1446,67 +1446,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1520,90 +1520,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 318d0bc2..db7b014d 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1446,67 +1446,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1520,90 +1520,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 9021bd9d..38d9e560 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1446,67 +1446,67 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 11 Added variables:
 
-  'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
-  'static Stream::StreamMap Stream::all_streams'
-  'static mutex_t Stream::m_stream_lock'
-  'static uint64_t Stream::m_streams_count'
-  'MYOFuncTableList __offload_myo_func_tables'
-  'MYOInitTableList __offload_myo_init_tables'
-  'MYOVarTableList __offload_myo_var_tables'
-  'MYOVarTableList __offload_myo_vtable_tables'
+  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
+  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
+  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
+  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'static Stream::StreamMap Stream::all_streams'
+  [A] 'static mutex_t Stream::m_stream_lock'
+  [A] 'static uint64_t Stream::m_streams_count'
+  [A] 'MYOFuncTableList __offload_myo_func_tables'
+  [A] 'MYOInitTableList __offload_myo_init_tables'
+  [A] 'MYOVarTableList __offload_myo_var_tables'
+  [A] 'MYOVarTableList __offload_myo_vtable_tables'
 
 1 Changed variable:
 
@@ -1520,90 +1520,90 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
 76 Added function symbols not referenced by debug info:
 
-  _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
-  _ZN12PtrDataTableD1Ev
-  _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
-  _ZN15MYOVarTableListD1Ev
-  _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
-  _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOFuncTableListD2Ev
-  _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
-  _ZN16MYOInitTableListD2Ev
-  _ZN7PtrDataD1Ev
-  _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
-  _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
-  _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOFuncTableED2Ev
-  _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI12MYOInitTableED2Ev
-  _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
-  _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
-  _ZN9TableListI9FuncTableED2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
-  _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt18_Rb_tree_node_baseC2Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt7__cxx114listIPcSaIS1_EED2Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
-  _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableC2Ev, aliases _ZN12PtrDataTableC1Ev
+  [A] _ZN12PtrDataTableD1Ev
+  [A] _ZN12PtrDataTableD2Ev, aliases _ZN12PtrDataTableD1Ev
+  [A] _ZN15MYOVarTableListD1Ev
+  [A] _ZN15MYOVarTableListD2Ev, aliases _ZN15MYOVarTableListD1Ev
+  [A] _ZN16MYOFuncTableListD1Ev, aliases _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOFuncTableListD2Ev
+  [A] _ZN16MYOInitTableListD1Ev, aliases _ZN16MYOInitTableListD2Ev
+  [A] _ZN16MYOInitTableListD2Ev
+  [A] _ZN7PtrDataD1Ev
+  [A] _ZN7PtrDataD2Ev, aliases _ZN7PtrDataD1Ev
+  [A] _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI11MYOVarTableED2Ev, aliases _ZN9TableListI11MYOVarTableED1Ev
+  [A] _ZN9TableListI12MYOFuncTableED1Ev, aliases _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOFuncTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED1Ev, aliases _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI12MYOInitTableED2Ev
+  [A] _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI8VarTableED2Ev, aliases _ZN9TableListI8VarTableED1Ev
+  [A] _ZN9TableListI9FuncTableED1Ev, aliases _ZN9TableListI9FuncTableED2Ev
+  [A] _ZN9TableListI9FuncTableED2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD1Ev, aliases _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt12_Vector_baseIPKN8VarTable5EntryESaIS3_EE12_Vector_implD2Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI7PtrDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI7PtrDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeI8AutoDataEC2Ev, aliases _ZNSt13_Rb_tree_nodeI8AutoDataEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC2Ev, aliases _ZNSt13_Rb_tree_nodeISt4pairIKmP6StreamEEC1Ev
+  [A] _ZNSt18_Rb_tree_node_baseC1Ev, aliases _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt18_Rb_tree_node_baseC2Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED2Ev, aliases _ZNSt3mapIPKvP17OffloadDescriptorSt4lessIS1_ESaISt4pairIKS1_S3_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED2Ev, aliases _ZNSt3mapImP6StreamSt4lessImESaISt4pairIKmS1_EEED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED2Ev, aliases _ZNSt3setI7PtrDataSt4lessIS0_ESaIS0_EED1Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED1Ev, aliases _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt3setI8AutoDataSt4lessIS0_ESaIS0_EED2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI11PersistDataSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI11TargetImageSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI6DynLibSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD2Ev, aliases _ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implD1Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP7PtrDataSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIP9coibufferSaIS2_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD1Ev, aliases _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx1110_List_baseIPcSaIS1_EE10_List_implD2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED1Ev, aliases _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI11PersistDataSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listI6DynLibSaIS1_EED2Ev, aliases _ZNSt7__cxx114listI6DynLibSaIS1_EED1Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP7PtrDataSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED1Ev, aliases _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIP9coibufferSaIS2_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED1Ev, aliases _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt7__cxx114listIPcSaIS1_EED2Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI7PtrDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED2Ev, aliases _ZNSt8_Rb_treeI8AutoDataS0_St9_IdentityIS0_ESt4lessIS0_ESaIS0_EE13_Rb_tree_implIS4_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED1Ev, aliases _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeIPKvSt4pairIKS1_P17OffloadDescriptorESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE13_Rb_tree_implISA_Lb1EED2Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED2Ev, aliases _ZNSt8_Rb_treeImSt4pairIKmP6StreamESt10_Select1stIS4_ESt4lessImESaIS4_EE13_Rb_tree_implIS8_Lb1EED1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
+  [A] _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC2Ev, aliases _ZNSt8iteratorISt18input_iterator_tagN8VarTable5EntryElPS2_RS2_EC1Ev
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index df13b950..04c27eea 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 6a165d55..b69e06d5 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -5,25 +5,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
-  'function void std::__throw_out_of_range_fmt(const char*, ...)'
-  'method virtual const char* std::bad_array_length::what() const'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
+  [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual std::bad_array_length::~bad_array_length(int)'
+  [A] 'method virtual std::bad_array_length::~bad_array_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_length
-  'method virtual const char* std::bad_array_new_length::what() const'
+  [A] 'method virtual const char* std::bad_array_new_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
+  [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  'function std::new_handler std::get_new_handler()'
-  'function std::terminate_handler std::get_terminate()'
-  'function std::unexpected_handler std::get_unexpected()'
-  'method std::regex_error::regex_error(std::regex_constants::error_type)'
+  [A] 'function std::new_handler std::get_new_handler()'
+  [A] 'function std::terminate_handler std::get_terminate()'
+  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
@@ -51,10 +51,10 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 6 Added variable symbols not referenced by debug info:
 
-  _ZTISt16bad_array_length@@CXXABI_1.3.8
-  _ZTISt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTSSt16bad_array_length@@CXXABI_1.3.8
-  _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
-  _ZTVSt16bad_array_length@@CXXABI_1.3.8
-  _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTISt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTISt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTSSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTSSt20bad_array_new_length@@CXXABI_1.3.8
+  [A] _ZTVSt16bad_array_length@@CXXABI_1.3.8
+  [A] _ZTVSt20bad_array_new_length@@CXXABI_1.3.8
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index 828e473a..ce3c272c 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 6 functions with some indirect sub-type change:
 
@@ -362,53 +362,53 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
-  'bool COI::is_available'
-  'static const int MicEnvVar::any_card'
-  'FuncList __offload_entries'
-  'FuncList __offload_funcs'
-  'OffloadInitType __offload_init_type'
-  'uint64_t __offload_use_2mb_buffers'
-  'VarList __offload_vars'
-  'int __omp_device_num'
-  'TargetImage* __target_exe'
-  'int console_enabled'
-  'uint64_t cpu_frequency'
-  'uint64_t mic_buffer_size'
-  'Engine* mic_engines'
-  'uint32_t mic_engines_total'
-  'MicEnvVar mic_env_vars'
-  'char* mic_library_path'
-  'char* mic_proxy_fs_root'
-  'bool mic_proxy_io'
-  'uint32_t mic_stack_size'
-  'pthread_key_t mic_thread_key'
-  'int offload_number'
-  'int offload_report_enabled'
-  'int offload_report_level'
-  'const char* prefix'
-  'int timer_enabled'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
+  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
+  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
+  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
+  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
+  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
+  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
+  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
+  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
+  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
+  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'bool COI::is_available'
+  [D] 'static const int MicEnvVar::any_card'
+  [D] 'FuncList __offload_entries'
+  [D] 'FuncList __offload_funcs'
+  [D] 'OffloadInitType __offload_init_type'
+  [D] 'uint64_t __offload_use_2mb_buffers'
+  [D] 'VarList __offload_vars'
+  [D] 'int __omp_device_num'
+  [D] 'TargetImage* __target_exe'
+  [D] 'int console_enabled'
+  [D] 'uint64_t cpu_frequency'
+  [D] 'uint64_t mic_buffer_size'
+  [D] 'Engine* mic_engines'
+  [D] 'uint32_t mic_engines_total'
+  [D] 'MicEnvVar mic_env_vars'
+  [D] 'char* mic_library_path'
+  [D] 'char* mic_proxy_fs_root'
+  [D] 'bool mic_proxy_io'
+  [D] 'uint32_t mic_stack_size'
+  [D] 'pthread_key_t mic_thread_key'
+  [D] 'int offload_number'
+  [D] 'int offload_report_enabled'
+  [D] 'int offload_report_level'
+  [D] 'const char* prefix'
+  [D] 'int timer_enabled'
 
 1 Changed variable:
 
@@ -422,11 +422,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 6ae2e3b0..53717b4f 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -5,88 +5,88 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  'function void COI::fini()'
-  'function bool COI::init()'
-  'function void* DL_sym(void*, const char*, const char*)'
-  'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
-  'method void FuncList::dump()'
-  'method void* FuncList::find_addr(const char*)'
-  'method const char* FuncList::find_name(void*)'
-  'method int64_t FuncList::max_name_length()'
-  'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
-  'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
-  'method MicEnvVar::VarValue::~VarValue(int)'
-  'method void MicEnvVar::add_env_var(int, char*, int, char*)'
-  'method void MicEnvVar::analyze_env_var(char*)'
-  'method char** MicEnvVar::create_environ_for_card(int)'
-  'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
-  'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
-  'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
-  'method MicEnvVar::~MicEnvVar(int)'
-  'method bool MyoWrapper::LoadLibrary()'
-  'function void ORSL::init()'
-  'function void ORSL::release(int)'
-  'function bool ORSL::reserve(int)'
-  'function bool ORSL::try_reserve(int)'
-  'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
-  'method bool OffloadDescriptor::compute()'
-  'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
-  'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
-  'method bool OffloadDescriptor::offload_finish()'
-  'method bool OffloadDescriptor::receive_pointer_data(bool)'
-  'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
-  'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
-  'method bool OffloadDescriptor::send_pointer_data(bool)'
-  'method bool OffloadDescriptor::wait_dependencies(void**, int)'
-  'function void Offload_Report_Epilog(OffloadHostTimerData*)'
-  'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  'function void Offload_Timer_Print()'
-  'method void VarList::dump()'
-  'method void VarList::table_copy(void*, int64_t)'
-  'method void VarList::table_patch_names(int64_t)'
-  'method int64_t VarList::table_size(int64_t&)'
-  'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
-  'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
-  'function void __dump_bytes(int, void*, int)'
-  'function uint64_t __dv_data_length(const ArrDesc*)'
-  'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
-  'function void __dv_desc_dump(const char*, const ArrDesc*)'
-  'function bool __dv_is_allocated(const ArrDesc*)'
-  'function bool __dv_is_contiguous(const ArrDesc*)'
-  'function void __liboffload_error_support(error_types, ...)'
-  'function int __offload_init_library()'
-  'function void __offload_myoFini()'
-  'function bool __offload_parse_int_string(const char*, int64_t&)'
-  'function bool __offload_parse_size_string(const char*, uint64_t&)'
-  'function int64_t cean_get_transf_size(CeanReadRanges*)'
-  'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
-  'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
-  'function int64_t get_el_value(char*, int64_t, int64_t)'
-  'function bool get_next_range(CeanReadRanges*, int64_t*)'
-  'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
-  'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
-  'function bool is_arr_desc_contiguous(const arr_desc*)'
-  'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
-  'function const char* offload_get_message_str(int)'
-  'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
-  'function void offload_report_free_data(OffloadHostTimerData*)'
-  'function void offload_stage_print(int, int, ...)'
-  'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
-  'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
-  'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
-  'function OffloadHostTimerData* offload_timer_init(const char*, int)'
-  'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
-  'function void print_range(const char*, uint64_t, uint64_t, int)'
-  'function const char* report_get_host_stage_str(int)'
-  'function const char* report_get_message_str(error_types)'
-  'function const char* report_get_target_stage_str(int)'
-  'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
-  'function void write_message(FILE*, int, __va_list_tag*)'
+  [D] 'function void COI::fini()'
+  [D] 'function bool COI::init()'
+  [D] 'function void* DL_sym(void*, const char*, const char*)'
+  [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'method void FuncList::dump()'
+  [D] 'method void* FuncList::find_addr(const char*)'
+  [D] 'method const char* FuncList::find_name(void*)'
+  [D] 'method int64_t FuncList::max_name_length()'
+  [D] 'method MicEnvVar::VarValue* MicEnvVar::CardEnvVars::find_var(char*, int)'
+  [D] 'method MicEnvVar::CardEnvVars::~CardEnvVars(int)'
+  [D] 'method MicEnvVar::VarValue::~VarValue(int)'
+  [D] 'method void MicEnvVar::add_env_var(int, char*, int, char*)'
+  [D] 'method void MicEnvVar::analyze_env_var(char*)'
+  [D] 'method char** MicEnvVar::create_environ_for_card(int)'
+  [D] 'method MicEnvVar::CardEnvVars* MicEnvVar::get_card(int)'
+  [D] 'method MicEnvVarKind MicEnvVar::get_env_var_kind(char*, int*, char**, int*, char**)'
+  [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
+  [D] 'method MicEnvVar::~MicEnvVar(int)'
+  [D] 'method bool MyoWrapper::LoadLibrary()'
+  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::release(int)'
+  [D] 'function bool ORSL::reserve(int)'
+  [D] 'function bool ORSL::try_reserve(int)'
+  [D] 'method bool OffloadDescriptor::alloc_ptr_data(PtrData*&, void*, int64_t, int64_t, int64_t, int)'
+  [D] 'method bool OffloadDescriptor::compute()'
+  [D] 'method bool OffloadDescriptor::find_ptr_data(PtrData*&, void*, int64_t, int64_t, bool)'
+  [D] 'method bool OffloadDescriptor::offload(const char*, bool, VarDesc*, VarDesc2*, int, void**, int, void**, int, void*)'
+  [D] 'method bool OffloadDescriptor::offload_finish()'
+  [D] 'method bool OffloadDescriptor::receive_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::recieve_noncontiguous_pointer_data(int, char*, COIBUFFER, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_noncontiguous_pointer_data(int, PtrData*, PtrData*, COIEVENT*)'
+  [D] 'method bool OffloadDescriptor::send_pointer_data(bool)'
+  [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
+  [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
+  [D] 'function void Offload_Timer_Print()'
+  [D] 'method void VarList::dump()'
+  [D] 'method void VarList::table_copy(void*, int64_t)'
+  [D] 'method void VarList::table_patch_names(int64_t)'
+  [D] 'method int64_t VarList::table_size(int64_t&)'
+  [D] 'function void __arr_data_offset_and_length(const arr_desc*, int64_t&, int64_t&)'
+  [D] 'function void __arr_desc_dump(const char*, const char*, const arr_desc*, bool)'
+  [D] 'function void __dump_bytes(int, void*, int)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*)'
+  [D] 'function uint64_t __dv_data_length(const ArrDesc*, int64_t)'
+  [D] 'function void __dv_desc_dump(const char*, const ArrDesc*)'
+  [D] 'function bool __dv_is_allocated(const ArrDesc*)'
+  [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
+  [D] 'function void __liboffload_error_support(error_types, ...)'
+  [D] 'function int __offload_init_library()'
+  [D] 'function void __offload_myoFini()'
+  [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
+  [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
+  [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
+  [D] 'function bool cean_ranges_match(CeanReadRanges*, CeanReadRanges*)'
+  [D] 'function void get_arr_desc_numbers(const arr_desc*, int64_t, int64_t&, int64_t&, int&, CeanReadRanges*&)'
+  [D] 'function int64_t get_el_value(char*, int64_t, int64_t)'
+  [D] 'function bool get_next_range(CeanReadRanges*, int64_t*)'
+  [D] 'function CeanReadRanges* init_read_ranges_arr_desc(const arr_desc*)'
+  [D] 'function CeanReadRanges* init_read_ranges_dv(const ArrDesc*)'
+  [D] 'function bool is_arr_desc_contiguous(const arr_desc*)'
+  [D] 'function arr_desc* make_arr_desc(void*, int64_t, int64_t, int64_t)'
+  [D] 'function const char* offload_get_message_str(int)'
+  [D] 'function int offload_offload_wrap(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void**, int, void*)'
+  [D] 'function void offload_report_free_data(OffloadHostTimerData*)'
+  [D] 'function void offload_stage_print(int, int, ...)'
+  [D] 'function void offload_timer_fill_host_mic_num(OffloadHostTimerData*, int)'
+  [D] 'function void offload_timer_fill_host_rdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_host_sdata(OffloadHostTimerData*, uint64_t)'
+  [D] 'function void offload_timer_fill_target_data(OffloadHostTimerData*, void*)'
+  [D] 'function OffloadHostTimerData* offload_timer_init(const char*, int)'
+  [D] 'function void offload_timer_start(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void offload_timer_stop(OffloadHostTimerData*, OffloadHostPhase)'
+  [D] 'function void print_range(const char*, uint64_t, uint64_t, int)'
+  [D] 'function const char* report_get_host_stage_str(int)'
+  [D] 'function const char* report_get_message_str(error_types)'
+  [D] 'function const char* report_get_target_stage_str(int)'
+  [D] 'function void std::__adjust_heap<VarList::BufEntry*, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, long int, long int, VarList::BufEntry, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__insertion_sort<VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__introsort_loop<VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, VarList::BufEntry*, long int, __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void std::__unguarded_linear_insert<VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)> >(VarList::BufEntry*, __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarList::BufEntry&, const VarList::BufEntry&)>)'
+  [D] 'function void write_message(FILE*, int, __va_list_tag*)'
 
 1 Changed variable:
 
@@ -100,11 +100,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 7 Removed function symbols not referenced by debug info:
 
-  _ZN7VarListD1Ev
-  _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
-  _ZN8FuncListD1Ev
-  _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
-  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZN7VarListD1Ev
+  [D] _ZN7VarListD2Ev, aliases _ZN7VarListD1Ev
+  [D] _ZN8FuncListD1Ev
+  [D] _ZN8FuncListD2Ev, aliases _ZN8FuncListD1Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev, aliases _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
+  [D] _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev
 
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index c908a059..c3945cce 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -5,34 +5,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 8 Removed functions:
 
-  'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
-  'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
-  'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
-  'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
-  'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
-  'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
+  [D] 'method void abigail::xml_writer::write_context::record_decl_only_type_as_emitted(abigail::ir::type_base*)'    {_ZN7abigail10xml_writer13write_context32record_decl_only_type_as_emittedEPNS_2ir9type_baseE}
+  [D] 'method std::_Deque_base<unsigned int, std::allocator<unsigned int> >::~_Deque_base(int)'    {_ZNSt11_Deque_baseIjSaIjEED2Ev, aliases _ZNSt11_Deque_baseIjSaIjEED1Ev}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_push_back_aux<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_}
+  [D] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_push_back_aux<unsigned int const&>(const unsigned int&)'    {_ZNSt5dequeIjSaIjEE16_M_push_back_auxIJRKjEEEvDpOT_}
+  [D] 'method void std::tr1::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2u>::_M_release()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv}
+  [D] 'method std::pair<bool, long unsigned int> std::tr1::__detail::_Prime_rehash_policy::_M_need_rehash(std::size_t, std::size_t, std::size_t) const'    {_ZNKSt3tr18__detail20_Prime_rehash_policy14_M_need_rehashEmmm}
+  [D] 'method std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>& std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>::operator=(const std::tr1::__shared_count<(__gnu_cxx::_Lock_policy)2u>&)'    {_ZNSt3tr114__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS3_}
 
 16 Added functions:
 
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
-  'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
-  'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
-  'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
-  'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
-  'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
-  'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
-  'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
-  'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
-  'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
-  'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
-  'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_class_tmpl(const abigail::ir::class_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context21get_id_for_class_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir11class_tdeclEEE}
+  [A] 'method std::__cxx11::string abigail::xml_writer::write_context::get_id_for_fn_tmpl(const abigail::ir::function_tdecl_sptr&)'    {_ZN7abigail10xml_writer13write_context18get_id_for_fn_tmplB5cxx11ERKNSt3tr110shared_ptrINS_2ir14function_tdeclEEE}
+  [A] 'method void abigail::xml_writer::write_context::record_type_id_as_emitted(const std::__cxx11::string&)'    {_ZN7abigail10xml_writer13write_context25record_type_id_as_emittedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(abigail::xml_writer::type_ptr_map&, std::vector<abigail::ir::type_base *, std::allocator<abigail::ir::type_base *> >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERNSt3tr113unordered_mapIPNS_2ir9type_baseENS_15interned_stringENS0_11type_hasherENS_10diff_utils19deep_ptr_eq_functorESaISt4pairIKS6_S7_EEEERSt6vectorIS6_SaIS6_EE}
+  [A] 'method void abigail::xml_writer::write_context::sort_types(const std::vector<std::tr1::shared_ptr<abigail::ir::function_type>, std::allocator<std::tr1::shared_ptr<abigail::ir::function_type> > >&, std::vector<std::tr1::shared_ptr<abigail::ir::type_base>, std::allocator<std::tr1::shared_ptr<abigail::ir::type_base> > >&)'    {_ZN7abigail10xml_writer13write_context10sort_typesERKSt6vectorINSt3tr110shared_ptrINS_2ir13function_typeEEESaIS7_EERS2_INS4_INS5_9type_baseEEESaISD_EE}
+  [A] 'method void std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_create_nodes(std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer, std::_Deque_base<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_Map_pointer)'    {_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_create_nodesEPPS5_S9_}
+  [A] 'method void std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_M_create_nodes(std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer, std::_Deque_base<unsigned int, std::allocator<unsigned int> >::_Map_pointer)'    {_ZNSt11_Deque_baseIjSaIjEE15_M_create_nodesEPPjS3_}
+  [A] 'method std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> std::__uninitialized_copy<false>::__uninit_copy<std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *> >(std::_Deque_iterator<std::__cxx11::basic_string<char>, const std::__cxx11::basic_string<char> &, const std::__cxx11::basic_string<char> *>, std::_Deque_iterator<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> &, std::__cxx11::basic_string<char> *>)'    {_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt15_Deque_iteratorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS8_PS9_ES2_IS8_RS8_PS8_EEET0_T_SH_SG_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_destroy_data_aux(std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::iterator)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_destroy_data_auxESt15_Deque_iteratorIS5_RS5_PS5_ESB_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_push_back_aux(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::value_type&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE16_M_push_back_auxERKS5_}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapEmb}
+  [A] 'method void std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >::deque(const std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)'    {_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEC2ERKS7_}
+  [A] 'method void std::deque<unsigned int, std::allocator<unsigned int> >::_M_reallocate_map(size_type, bool)'    {_ZNSt5dequeIjSaIjEE17_M_reallocate_mapEmb}
+  [A] 'method void std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::push(const std::stack<std::__cxx11::basic_string<char>, std::deque<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > >::value_type&)'    {_ZNSt5stackINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt5dequeIS5_SaIS5_EEE4pushERKS5_}
+  [A] 'method virtual std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>::~_Sp_counted_base()'    {_ZNSt3tr116_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev}
     note that this adds a new entry to the vtable of class std::tr1::_Sp_counted_base<__gnu_cxx::_Lock_policy::_S_atomic>
-  'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
+  [A] 'function void std::tr1::__enable_shared_from_this_helper<__gnu_cxx::_Lock_policy::_S_atomic>(const std::tr1::__shared_count<__gnu_cxx::_Lock_policy::_S_atomic>&, ...)'    {_ZNSt3tr132__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEEvRKNS_14__shared_countIXT_EEEz}
 
 2 functions with some indirect sub-type change:
 
@@ -52,5 +52,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _ZN7abigail10xml_writer13write_contextD1Ev
+  [D] _ZN7abigail10xml_writer13write_contextD1Ev
 
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index 0699c146..0787f566 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -3,8 +3,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 Added functions:
 
-  'method S::S()'
-  'method int S::mem_fn1()'
+  [A] 'method S::S()'
+  [A] 'method int S::mem_fn1()'
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index f65e09e0..cd0cba4f 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -47,21 +47,21 @@
 
   6 Removed variable symbols not referenced by debug info:
 
-    gtk__glarea__C210s
-    gtk__glarea__gtk_glarea_recordB43s
-    gtk__glarea__gtk_glarea_recordE39s
-    gtk__glarea__gtk_glarea_recordH40s
-    gtk__glarea__gtk_glarea_recordR41s
-    gtk__glarea__gtk_glarea_recordR41s___UNC
+    [D] gtk__glarea__C210s
+    [D] gtk__glarea__gtk_glarea_recordB43s
+    [D] gtk__glarea__gtk_glarea_recordE39s
+    [D] gtk__glarea__gtk_glarea_recordH40s
+    [D] gtk__glarea__gtk_glarea_recordR41s
+    [D] gtk__glarea__gtk_glarea_recordR41s___UNC
 
   6 Added variable symbols not referenced by debug info:
 
-    gtk__glarea__C208s
-    gtk__glarea__gtk_glarea_recordB41s
-    gtk__glarea__gtk_glarea_recordE37s
-    gtk__glarea__gtk_glarea_recordH38s
-    gtk__glarea__gtk_glarea_recordR39s
-    gtk__glarea__gtk_glarea_recordR39s___UNC
+    [A] gtk__glarea__C208s
+    [A] gtk__glarea__gtk_glarea_recordB41s
+    [A] gtk__glarea__gtk_glarea_recordE37s
+    [A] gtk__glarea__gtk_glarea_recordH38s
+    [A] gtk__glarea__gtk_glarea_recordR39s
+    [A] gtk__glarea__gtk_glarea_recordR39s___UNC
 
 ================ end of changes of 'libgtkada_gl-2.24.so.2'===============
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 2dad2619..5582b1f9 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -5,32 +5,32 @@
 
   16 Added functions:
 
-    'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
-    'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
-    'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
-    'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
-    'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
-    'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
-    'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
-    'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
-    'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
-    'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
-    'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
-    'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
-    'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
-    'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
-    'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
-    'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
+    [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
+    [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
+    [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
+    [A] 'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
+    [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
+    [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
+    [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
+    [A] 'function char* flatpak_remote_get_homepage(FlatpakRemote*)'    {flatpak_remote_get_homepage}
+    [A] 'function char* flatpak_remote_get_icon(FlatpakRemote*)'    {flatpak_remote_get_icon}
+    [A] 'function FlatpakRemote* flatpak_remote_new_from_file(const char*, GBytes*, GError**)'    {flatpak_remote_new_from_file}
+    [A] 'function void flatpak_remote_set_comment(FlatpakRemote*, const char*)'    {flatpak_remote_set_comment}
+    [A] 'function void flatpak_remote_set_description(FlatpakRemote*, const char*)'    {flatpak_remote_set_description}
+    [A] 'function void flatpak_remote_set_filter(FlatpakRemote*, const char*)'    {flatpak_remote_set_filter}
+    [A] 'function void flatpak_remote_set_homepage(FlatpakRemote*, const char*)'    {flatpak_remote_set_homepage}
+    [A] 'function void flatpak_remote_set_icon(FlatpakRemote*, const char*)'    {flatpak_remote_set_icon}
+    [A] 'function gboolean flatpak_transaction_add_rebase(FlatpakTransaction*, const char*, const char*, const char**, const char**, GError**)'    {flatpak_transaction_add_rebase}
 
   3 removed types unreachable from any public interface:
 
-    struct _GUnixFDList at gunixfdlist.h:58:1
-    typedef GUnixFDList at giotypes.h:549:1
-    typedef GUnixFDListPrivate at gunixfdlist.h:41:1
+    [D] 'struct _GUnixFDList' at gunixfdlist.h:58:1
+    [D] 'typedef GUnixFDList' at giotypes.h:549:1
+    [D] 'typedef GUnixFDListPrivate' at gunixfdlist.h:41:1
 
   1 changed type unreachable from any public interface:
 
-  'struct _FlatpakTransactionClass' changed:
+    [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
         'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* _FlatpakTransactionClass::end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
@@ -43,9 +43,9 @@
 
   3 added types unreachable from any public interface:
 
-    'struct gpgme_data_cbs' at gpgme-64.h:1139:1
-    'typedef GSubprocess' at giotypes.h:642:1
-    'typedef OstreeRepoResolveRevExtFlags' at ostree-repo.h:473:1
+    [A] 'struct gpgme_data_cbs' at gpgme-64.h:1139:1
+    [A] 'typedef GSubprocess' at giotypes.h:642:1
+    [A] 'typedef OstreeRepoResolveRevExtFlags' at ostree-repo.h:473:1
 
 ================ end of changes of 'libflatpak.so.0.10204.0'===============
 
diff --git a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
index 383f8dd2..acc301fd 100644
--- a/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
+++ b/tests/data/test-diff-pkg/dbus-glib-0.104-3.fc23.x86_64--dbus-glib-0.104-3.fc23.armv7hl-report-0.txt
@@ -9,20 +9,20 @@
 
   5 Added function symbols not referenced by debug info:
 
-    __libc_csu_fini
-    __libc_csu_init
-    base_info_ref
-    base_info_unref
-    main
+    [A] __libc_csu_fini
+    [A] __libc_csu_init
+    [A] base_info_ref
+    [A] base_info_unref
+    [A] main
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
 Removed binaries:
-  /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [D] /usr/lib64/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
 Added binaries:
-  /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
+  [A] /usr/lib/libdbus-glib-1.so.2.3.2, SONAME: libdbus-glib-1.so.2
diff --git a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
index 37e6b486..9d1f078d 100644
--- a/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
+++ b/tests/data/test-diff-pkg/elfutils-libs-0.170-4.el7.x86_64-multiple-sym-vers-report-0.txt
@@ -4,10 +4,10 @@
 
   4 Added functions:
 
-    'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
-    'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
-    'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
-    'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
+    [A] 'function int dwarf_cu_info(Dwarf_CU*, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*, uint64_t*, uint8_t*, uint8_t*)'    {dwarf_cu_info@@ELFUTILS_0.171}
+    [A] 'function Dwarf_Die* dwarf_die_addr_die(Dwarf*, void*, Dwarf_Die*)'    {dwarf_die_addr_die@@ELFUTILS_0.171}
+    [A] 'function int dwarf_get_units(Dwarf*, Dwarf_CU*, Dwarf_CU**, Dwarf_Half*, uint8_t*, Dwarf_Die*, Dwarf_Die*)'    {dwarf_get_units@@ELFUTILS_0.171}
+    [A] 'function int dwarf_getabbrevattr_data(Dwarf_Abbrev*, size_t, unsigned int*, unsigned int*, Dwarf_Sword*, Dwarf_Off*)'    {dwarf_getabbrevattr_data@@ELFUTILS_0.171}
 
 ================ end of changes of 'libdw-0.170.so'===============
 
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index f6f4cd98..36ee709e 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -4,9 +4,9 @@
 
   3 Added functions:
 
-    'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
-    'function int _IceTransListen(const char*)'    {_IceTransListen}
-    'function int _IceTransReceived(const char*)'    {_IceTransReceived}
+    [A] 'function int _IceTransIsListening(const char*)'    {_IceTransIsListening}
+    [A] 'function int _IceTransListen(const char*)'    {_IceTransListen}
+    [A] 'function int _IceTransReceived(const char*)'    {_IceTransReceived}
 
   1 function with some indirect sub-type change:
 
@@ -88,7 +88,7 @@
 
   1 Removed variable:
 
-    'const in6_addr in6addr_any'    {in6addr_any}
+    [D] 'const in6_addr in6addr_any'    {in6addr_any}
 
   2 Changed variables:
 
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index c4f420fa..1c37b424 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -50,11 +50,11 @@
 
   1 Removed function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
+    [D] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_emplace_back_aux<ISO9660::Stat*>(ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_}
 
   1 Added function:
 
-    'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
+    [A] 'method void std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::_M_realloc_insert<ISO9660::Stat*>(std::vector<ISO9660::Stat*, std::allocator<ISO9660::Stat*> >::iterator, ISO9660::Stat*&&)'    {_ZNSt6vectorIPN7ISO96604StatESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_}
 
 ================ end of changes of 'libiso9660++.so.0.0.0'===============
 
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 1cd20374..954b3f16 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -4,11 +4,11 @@
 
   1 Removed function:
 
-    'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
+    [D] 'method void std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt10_List_baseIN4sigc9slot_baseESaIS1_EE8_M_clearEv}
 
   1 Added function:
 
-    'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
+    [A] 'method void std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_clear()'    {_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index b23de5ae..75a2454b 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -23,7 +23,7 @@
 
   1 Added function:
 
-    'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
+    [A] 'function SECStatus SSL_ConfigServerCert(PRFileDesc*, CERTCertificate*, SECKEYPrivateKey*, const SSLExtraServerCertData*, unsigned int)'    {SSL_ConfigServerCert@@NSS_3.24}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
index 70b41ddd..3ebfcd87 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
index 0b909f90..0c4de257 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   2 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index 163c176c..c7b840fb 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -4,18 +4,18 @@
 
   1 Removed function:
 
-    'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
+    [D] 'function int spice_server_migrate_client_state(SpiceServer*)'    {spice_server_migrate_client_state@@SPICE_SERVER_0.6.0}
 
   8 Added functions:
 
-    'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
-    'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
-    'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
-    'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
-    'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
-    'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
-    'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_replay_free(SpiceReplay*)'    {spice_replay_free@@SPICE_SERVER_0.12.6}
+    [A] 'function void spice_replay_free_cmd(SpiceReplay*, QXLCommandExt*)'    {spice_replay_free_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function SpiceReplay* spice_replay_new(FILE*, int)'    {spice_replay_new@@SPICE_SERVER_0.12.6}
+    [A] 'function QXLCommandExt* spice_replay_next_cmd(SpiceReplay*, QXLWorker*)'    {spice_replay_next_cmd@@SPICE_SERVER_0.12.6}
+    [A] 'function uint32_t spice_server_get_best_playback_rate(SpicePlaybackInstance*)'    {spice_server_get_best_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function uint32_t spice_server_get_best_record_rate(SpiceRecordInstance*)'    {spice_server_get_best_record_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)'    {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5}
+    [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)'    {spice_server_set_record_rate@@SPICE_SERVER_0.12.5}
 
   79 functions with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index e192f2b2..3ae521aa 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   8 functions with some indirect sub-type change:
 
@@ -226,9 +226,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -240,45 +240,45 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -288,15 +288,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 203b8473..98d78814 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -6,23 +6,23 @@
 
   17 Added functions:
 
-    'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
-    'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
-    'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
-    'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
-    'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
-    'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
-    'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
-    'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
-    'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
-    'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_terminate()'    {_ZN3tbb10interface78internal15task_arena_base18internal_terminateEv}
+    [A] 'method void tbb::interface7::internal::task_arena_base::internal_wait() const'    {_ZNK3tbb10interface78internal15task_arena_base13internal_waitEv}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_reader(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_readerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&, bool)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex23internal_acquire_writerERNS2_11scoped_lockEb}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_construct()'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_constructEv}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_downgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex18internal_downgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::interface8::internal::x86_rtm_rw_mutex::internal_release(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_releaseERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_try_acquire_writer(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex27internal_try_acquire_writerERNS2_11scoped_lockE}
+    [A] 'method bool tbb::interface8::internal::x86_rtm_rw_mutex::internal_upgrade(tbb::interface8::internal::x86_rtm_rw_mutex::scoped_lock&)'    {_ZN3tbb10interface88internal16x86_rtm_rw_mutex16internal_upgradeERNS2_11scoped_lockE}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::internal_push_move(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v818internal_push_moveEPKv}
+    [A] 'method bool tbb::internal::concurrent_queue_base_v8::internal_push_move_if_not_full(void*)'    {_ZN3tbb8internal24concurrent_queue_base_v830internal_push_move_if_not_fullEPKv}
+    [A] 'method void tbb::internal::concurrent_queue_base_v8::move_content(tbb::internal::concurrent_queue_base_v8&)'    {_ZN3tbb8internal24concurrent_queue_base_v812move_contentERS1_}
+    [A] 'method void tbb::task_group_context::capture_fp_settings()'    {_ZN3tbb18task_group_context19capture_fp_settingsEv}
 
   7 functions with some indirect sub-type change:
 
@@ -86,9 +86,9 @@
 
   3 Removed variable symbols not referenced by debug info:
 
-    _ZTVN3rml16versioned_objectE
-    _ZTVN3rml6clientE
-    _ZTVN3rml6serverE
+    [D] _ZTVN3rml16versioned_objectE
+    [D] _ZTVN3rml6clientE
+    [D] _ZTVN3rml6serverE
 
 ================ end of changes of 'libtbb.so.2'===============
 
@@ -100,45 +100,45 @@
 
   9 Removed functions:
 
-    'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
-    'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
-    'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
-    'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
-    'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
-    'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
-    'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
+    [D] 'function void* rml::internal::__TBB_internal_calloc(size_t, size_t)'    {__TBB_internal_calloc}
+    [D] 'function void rml::internal::__TBB_internal_free(void*)'    {__TBB_internal_free}
+    [D] 'function void* rml::internal::__TBB_internal_malloc(size_t)'    {__TBB_internal_malloc}
+    [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
+    [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
+    [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
+    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
 
-    _Z10BitScanRevm
-    _Z10FencedLoadRVKl
-    _Z11FencedStoreRVll
-    _Z15AtomicIncrementRVl
-    _Z15SpinWaitWhileEqRVKll
-    _Z16AtomicFetchStorePVvm
-    _Z21AtomicCompareExchangeRVlll
-    _Z8AtomicOrPVvm
-    _Z8do_yieldv
-    _Z9AtomicAddRVll
-    _Z9AtomicAndPVvm
-    _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
-    _ZN11MallocMutex11scoped_lockC2ERS_bPb
-    _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutex11scoped_lockD2Ev
-    _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
-    _ZN11MallocMutexC2Ev
-    _ZdlPvS_
-    _ZnwmPv
-    __TBB_malloc_safer_aligned_msize
-    __TBB_malloc_safer_aligned_realloc
-    __TBB_malloc_safer_free
-    __TBB_malloc_safer_msize
-    __TBB_malloc_safer_realloc
-    scalable_allocation_command
+    [A] _Z10BitScanRevm
+    [A] _Z10FencedLoadRVKl
+    [A] _Z11FencedStoreRVll
+    [A] _Z15AtomicIncrementRVl
+    [A] _Z15SpinWaitWhileEqRVKll
+    [A] _Z16AtomicFetchStorePVvm
+    [A] _Z21AtomicCompareExchangeRVlll
+    [A] _Z8AtomicOrPVvm
+    [A] _Z8do_yieldv
+    [A] _Z9AtomicAddRVll
+    [A] _Z9AtomicAndPVvm
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC1ERS_bPb, aliases _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_, aliases _ZN11MallocMutex11scoped_lockC1ERS_
+    [A] _ZN11MallocMutex11scoped_lockC2ERS_bPb
+    [A] _ZN11MallocMutex11scoped_lockD1Ev, aliases _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutex11scoped_lockD2Ev
+    [A] _ZN11MallocMutexC1Ev, aliases _ZN11MallocMutexC2Ev
+    [A] _ZN11MallocMutexC2Ev
+    [A] _ZdlPvS_
+    [A] _ZnwmPv
+    [A] __TBB_malloc_safer_aligned_msize
+    [A] __TBB_malloc_safer_aligned_realloc
+    [A] __TBB_malloc_safer_free
+    [A] __TBB_malloc_safer_msize
+    [A] __TBB_malloc_safer_realloc
+    [A] scalable_allocation_command
 
 ================ end of changes of 'libtbbmalloc.so.2'===============
 
@@ -148,15 +148,15 @@
 
   1 Removed function:
 
-    'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
+    [D] 'function bool __TBB_internal_find_original_malloc(int, const char**, void**)'    {__TBB_internal_find_original_malloc}
 
   5 Added functions:
 
-    'function void __libc_free(void*)'    {__libc_free}
-    'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
-    'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
-    'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
-    'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
+    [A] 'function void __libc_free(void*)'    {__libc_free}
+    [A] 'function void* __libc_realloc(void*, size_t)'    {__libc_realloc}
+    [A] 'function void* calloc(size_t, size_t)'    {__libc_calloc, aliases calloc}
+    [A] 'function size_t malloc_usable_size(void*)'    {malloc_usable_size}
+    [A] 'function void* valloc(size_t)'    {__libc_valloc, aliases valloc}
 
 ================ end of changes of 'libtbbmalloc_proxy.so.2'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-0.txt b/tests/data/test-diff-pkg/test-rpm-report-0.txt
index df340812..c9c03e14 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-0.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-1.txt b/tests/data/test-diff-pkg/test-rpm-report-1.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-1.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-1.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-2.txt b/tests/data/test-diff-pkg/test-rpm-report-2.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-2.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-2.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-3.txt b/tests/data/test-diff-pkg/test-rpm-report-3.txt
index 0f7264aa..1ad6c876 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-3.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-3.txt
@@ -6,14 +6,14 @@
 
   8 Added function symbols not referenced by debug info:
 
-    dbus_g_bus_get_private
-    dbus_g_connection_open_private
-    dbus_g_connection_unregister_g_object
-    dbus_g_method_invocation_get_g_connection
-    dbus_g_object_type_register_shadow_property
-    dbus_g_value_build_g_variant
-    dbus_g_value_parse_g_variant
-    dbus_glib_global_set_disable_legacy_property_access
+    [A] dbus_g_bus_get_private
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_connection_unregister_g_object
+    [A] dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_object_type_register_shadow_property
+    [A] dbus_g_value_build_g_variant
+    [A] dbus_g_value_parse_g_variant
+    [A] dbus_glib_global_set_disable_legacy_property_access
 
 ================ end of changes of 'libdbus-glib-1.so.2.1.0'===============
 
@@ -25,12 +25,12 @@
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
   1 Added function symbol not referenced by debug info:
 
-    dbus_g_value_build_g_variant
+    [A] dbus_g_value_build_g_variant
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-pkg/test-rpm-report-5.txt b/tests/data/test-diff-pkg/test-rpm-report-5.txt
index 56140b44..f469bbc5 100644
--- a/tests/data/test-diff-pkg/test-rpm-report-5.txt
+++ b/tests/data/test-diff-pkg/test-rpm-report-5.txt
@@ -5,8 +5,8 @@
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
index a0cb5cf7..0ab050b2 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 70ec5a75..da13c8e6 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv}
+  [A] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index 054254fb..40316b33 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
index 29d021e9..4d7d51cd 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index 80012c1e..e12412dc 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void bar()'    {_Z3barv}
+  [D] 'function void bar()'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index 71f601f9..4dd5ca39 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
index 8aab663e..d1e246cf 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed (1 filtered out), 1 Added variab
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index 71f601f9..4dd5ca39 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Added variable:
 
-  'int var1'    {var1}
+  [A] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index a8dc9848..4b7ee8df 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
index be6bc1ed..2ebce7a5 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 1 Removed, 0 Changed (1 filtered out), 0 Added variab
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index a8dc9848..4b7ee8df 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Removed variable:
 
-  'int var1'    {var1}
+  [D] 'int var1'    {var1}
 
 1 Changed variable:
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-0.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
index ec843c55..821657f4 100644
--- a/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test19-suppr-added-fn-sym-report-5.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Added function symbol not referenced by debug info:
 
-  _Z3barv
+  [A] _Z3barv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-1.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-2.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-3.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-4.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
index a3621dc5..e4fefae6 100644
--- a/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test20-suppr-removed-fn-sym-report-5.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Removed function symbol not referenced by debug info:
 
-  _Z3foov
+  [D] _Z3foov
 
 2 Added function symbols not referenced by debug info:
 
-  _Z3bazv
-  _Z6foobarv
+  [A] _Z3bazv
+  [A] _Z6foobarv
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
index ad029060..803f2d82 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-0.txt
@@ -5,6 +5,6 @@ Variable symbols changes summary: 0 Removed, 2 Added variable symbols not refere
 
 2 Added variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [A] global_var1
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-1.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-2.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
index 412cc757..25e3c0c3 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-3.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var2
+  [A] global_var2
 
diff --git a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
index fa6cf485..8da63313 100644
--- a/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test21-suppr-added-var-sym-report-4.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed, 1 Added (1 filtered out) variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var1
+  [A] global_var1
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
index 1756ef53..779086e5 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-0.txt
@@ -5,10 +5,10 @@ Variable symbols changes summary: 2 Removed, 1 Added variable symbols not refere
 
 2 Removed variable symbols not referenced by debug info:
 
-  global_var1
-  global_var2
+  [D] global_var1
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-1.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
index e0914d64..5549648d 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-2.txt
@@ -5,5 +5,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
index ae539cc1..a8579ba0 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-3.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var2
+  [D] global_var2
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
index e4442c4d..6ec7d542 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt
@@ -5,9 +5,9 @@ Variable symbols changes summary: 1 Removed (1 filtered out), 1 Added variable s
 
 1 Removed variable symbol not referenced by debug info:
 
-  global_var1
+  [D] global_var1
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
index 2b4f9883..174f1b93 100644
--- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
+++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt
@@ -6,5 +6,5 @@ Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable s
 
 1 Added variable symbol not referenced by debug info:
 
-  global_var3
+  [A] global_var3
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
index 3677a75b..ecb6d981 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
index 9cc498fc..853dd162 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar()'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index 15790f64..4c7cfce2 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
+  [D] 'method virtual int non_defined_class::virtual_func_to_be_removed()'    {_ZN17non_defined_class26virtual_func_to_be_removedEv}
     note that this removes an entry from the vtable of class non_defined_class
 
 1 Added function:
 
-  'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
+  [A] 'method virtual int non_defined_class::virtual_func_inserted()'    {_ZN17non_defined_class21virtual_func_insertedEv}
     note that this adds a new entry to the vtable of class non_defined_class
 
 2 functions with some indirect sub-type change:
diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
index b1ba80e8..1b49d600 100644
--- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
+++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
@@ -3,9 +3,9 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  'function void test2()'    {test2}
+  [D] 'function void test2()'    {test2}
 
 1 Removed variable:
 
-  'char test2_variable'    {test2_variable}
+  [D] 'char test2_variable'    {test2_variable}
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
index 5efd5df5..a1b349bb 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
@@ -4,11 +4,11 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -16,5 +16,5 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
index 21005c2a..84c24bc5 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
@@ -4,7 +4,7 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -12,5 +12,5 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
index d0736bf3..15dce83a 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-3.txt
@@ -4,10 +4,10 @@ Unreachable types summary: 1 removed, 0 changed (1 filtered out), 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
index 1004cdf2..3249a77a 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
@@ -4,11 +4,11 @@ Unreachable types summary: 1 removed, 1 changed, 0 added (1 filtered out) types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
index 51af7fea..7de31388 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
@@ -6,11 +6,11 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 removed type unreachable from any public interface:
 
-  struct unreachable_struct1 at test-v0.c:6:1
+  [D] 'struct unreachable_struct1' at test-v0.c:6:1
 
 1 changed type unreachable from any public interface:
 
-  'struct unreachable_struct2' changed:
+  [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
       'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
@@ -18,5 +18,5 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
 
 1 added type unreachable from any public interface:
 
-  'struct unreachable_struct3' at test-v1.c:12:1
+  [A] 'struct unreachable_struct3' at test-v1.c:12:1
 
diff --git a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
index 71307d78..28ee3afe 100644
--- a/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,17 +19,17 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -42,8 +42,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -53,8 +53,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index 99926664..9f4d1f65 100644
--- a/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
index 71307d78..28ee3afe 100644
--- a/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,17 +19,17 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
@@ -42,8 +42,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -53,8 +53,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
index 4dcdf37e..f864f9aa 100644
--- a/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -19,17 +19,17 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.i686.rpm and dbus
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
   1 Added function:
 
-    'function int main(int, char**)'    {main}
+    [A] 'function int main(int, char**)'    {main}
 
   2 Removed variable symbols not referenced by debug info:
 
-    stderr
-    stdout
+    [D] stderr
+    [D] stdout
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
index 99926664..9f4d1f65 100644
--- a/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt
@@ -6,8 +6,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added functions:
 
-    'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
-    'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
+    [A] 'function DBusGConnection* dbus_g_connection_open_private(const gchar*, GMainContext*, GError**)'    {dbus_g_connection_open_private}
+    [A] 'function DBusGConnection* dbus_g_method_invocation_get_g_connection(DBusGMethodInvocation*)'    {dbus_g_method_invocation_get_g_connection}
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -17,8 +17,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed functions:
 
-    'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
-    'function void base_info_unref(BaseInfo*)'    {base_info_unref}
+    [D] 'function BaseInfo* base_info_ref(BaseInfo*)'    {base_info_ref}
+    [D] 'function void base_info_unref(BaseInfo*)'    {base_info_unref}
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
index b3123d3c..63378fd8 100644
--- a/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt
@@ -8,8 +8,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Added function symbols not referenced by debug info:
 
-    dbus_g_connection_open_private
-    dbus_g_method_invocation_get_g_connection
+    [A] dbus_g_connection_open_private
+    [A] dbus_g_method_invocation_get_g_connection
 
 ================ end of changes of 'libdbus-glib-1.so.2.2.2'===============
 
@@ -21,8 +21,8 @@ Comparing the ABI of binaries between dbus-glib-0.100.2-2.fc20.x86_64.rpm and db
 
   2 Removed function symbols not referenced by debug info:
 
-    base_info_ref
-    base_info_unref
+    [D] base_info_ref
+    [D] base_info_unref
 
 ================ end of changes of 'dbus-binding-tool'===============
 
diff --git a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
index b3ee9111..006b334e 100644
--- a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
@@ -8,43 +8,43 @@ Comparing the ABI of binaries between nss-util-3.12.6-1.fc14.x86_64.rpm and nss-
 
   37 Added function symbols not referenced by debug info:
 
-    NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
-    NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
-    NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
-    NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
-    NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
-    NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
-    NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
-    NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
-    NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
-    NSSUTIL_ArgReadLong@@NSSUTIL_3.14
-    NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
-    NSSUTIL_ArgStrip@@NSSUTIL_3.14
-    NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscape@@NSSUTIL_3.14
-    NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
-    NSSUTIL_Escape@@NSSUTIL_3.14
-    NSSUTIL_EscapeSize@@NSSUTIL_3.14
-    NSSUTIL_GetVersion@@NSSUTIL_3.13
-    NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
-    NSSUTIL_MkNSSString@@NSSUTIL_3.14
-    NSSUTIL_MkSlotString@@NSSUTIL_3.14
-    NSSUTIL_Quote@@NSSUTIL_3.14
-    NSSUTIL_QuoteSize@@NSSUTIL_3.14
-    NSS_InitializePRErrorTable@@NSSUTIL_3.13
-    PORT_DestroyCheapArena@@NSSUTIL_3.24
-    PORT_InitCheapArena@@NSSUTIL_3.24
-    PORT_RegExpSearch@@NSSUTIL_3.12.7
-    SECITEM_AllocArray@@NSSUTIL_3.15
-    SECITEM_DupArray@@NSSUTIL_3.15
-    SECITEM_FreeArray@@NSSUTIL_3.15
-    SECITEM_ReallocItemV2@@NSSUTIL_3.15
-    SECITEM_ZfreeArray@@NSSUTIL_3.15
-    _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
-    _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
-    _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
+    [A] NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
+    [A] NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgReadLong@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
+    [A] NSSUTIL_ArgStrip@@NSSUTIL_3.14
+    [A] NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscape@@NSSUTIL_3.14
+    [A] NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_Escape@@NSSUTIL_3.14
+    [A] NSSUTIL_EscapeSize@@NSSUTIL_3.14
+    [A] NSSUTIL_GetVersion@@NSSUTIL_3.13
+    [A] NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
+    [A] NSSUTIL_MkNSSString@@NSSUTIL_3.14
+    [A] NSSUTIL_MkSlotString@@NSSUTIL_3.14
+    [A] NSSUTIL_Quote@@NSSUTIL_3.14
+    [A] NSSUTIL_QuoteSize@@NSSUTIL_3.14
+    [A] NSS_InitializePRErrorTable@@NSSUTIL_3.13
+    [A] PORT_DestroyCheapArena@@NSSUTIL_3.24
+    [A] PORT_InitCheapArena@@NSSUTIL_3.24
+    [A] PORT_RegExpSearch@@NSSUTIL_3.12.7
+    [A] SECITEM_AllocArray@@NSSUTIL_3.15
+    [A] SECITEM_DupArray@@NSSUTIL_3.15
+    [A] SECITEM_FreeArray@@NSSUTIL_3.15
+    [A] SECITEM_ReallocItemV2@@NSSUTIL_3.15
+    [A] SECITEM_ZfreeArray@@NSSUTIL_3.15
+    [A] _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
+    [A] _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
+    [A] _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
 
 ================ end of changes of 'libnssutil3.so'===============
 
diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
index 0a953a63..8e6fdd4e 100644
--- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
@@ -6,9 +6,9 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   3 Added functions:
 
-    'function const char* vte_get_features()'    {vte_get_features}
-    'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
-    'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
+    [A] 'function const char* vte_get_features()'    {vte_get_features}
+    [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
+    [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
 
 ================ end of changes of 'libvte-2.91.so.0.3901.0'===============
 
@@ -20,7 +20,7 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   1 Added variable symbol not referenced by debug info:
 
-    stderr
+    [A] stderr
 
 ================ end of changes of 'gnome-pty-helper'===============
 
diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 83fdc2b6..191d6d38 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -2471,7 +2471,7 @@ compare_prepared_userspace_packages(package& first_package,
 	{
 	  string relative_path;
 	  first_package.convert_path_to_relative((*it)->path, relative_path);
-	  cout << "  " << relative_path << ", ";
+	  cout << "  [D] " << relative_path << ", ";
 	  string soname;
 	  get_soname_of_elf_file((*it)->path, soname);
 	  if (!soname.empty())
@@ -2491,7 +2491,7 @@ compare_prepared_userspace_packages(package& first_package,
 	{
 	  string relative_path;
 	  second_package.convert_path_to_relative((*it)->path, relative_path);
-	  cout << "  " << relative_path << ", ";
+	  cout << "  [A] " << relative_path << ", ";
 	  string soname;
 	  get_soname_of_elf_file((*it)->path, soname);
 	  if (!soname.empty())
-- 
2.25.1.481.gfbce0eb801-goog


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2 v3] Tag add/remove/change lines unconditionally with [A], [D], [C].
  2020-03-17 13:19     ` [PATCH 2/2 v3] " Giuliano Procida
@ 2020-03-18 14:27       ` Dodji Seketeli
  0 siblings, 0 replies; 7+ messages in thread
From: Dodji Seketeli @ 2020-03-18 14:27 UTC (permalink / raw)
  To: Giuliano Procida; +Cc: libabigail, kernel-team

Hello Giuliano,

Giuliano Procida <gprocida@google.com> a écrit:

> These tags were previously only emitted by the default reporter if the
> there were more than 100 (hard-coded constant) items in a a list. The
> leaf reporter emitted them unconditionally. This change simplifies the
> code, makes output more consistent and makes it easier to interpret
> diffs of diff output.
>
> Additionally, in the reporting of changed unreachable types, the
> indentation and quoting for the deleted and added cases was missing.
> This patch corrects these issues.
>
> Finally, when doing package differences, there were no tags for
> deleted/added binaries. This patch adds them.
>
> 	* src/abg-default-reporter.cc (report): In the corpus_diff
> 	override, remove calculations of number of changes (total) and
> 	comparisons against arbitrary threshold (large_num); emit [A],
> 	[D], [C] tags unconditionally.
> 	* src/abg-reporter-priv.cc
> 	(maybe_report_unreachable_type_changes): Remove comparisons of
> 	number of changes against arbitrary threshold (large_num);
> 	emit [A], [D], [C] tags unconditionally; fix quoting of
>         deleted unreachable types; fix indentation of changed
> 	unreachable types.
> 	* tools/abipkgdiff.cc (compare_prepared_userspace_packages):
> 	Emit [D] and [A] tags for removed and added binaries.
> 	* tests/data/test-*/*report*.txt: In 109 report files, add
>         tags [A], [D], [C] tags and correct some indentation and
>         quoting.

Applied to master.

Thanks!!

-- 
		Dodji

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-03-18 14:27 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-01  0:00 [PATCH 1/2] Add space missing between "[C]" tag and description of changed item Giuliano Procida via libabigail
2020-01-01  0:00 ` Dodji Seketeli
2020-01-01  0:00 ` [PATCH 2/2] Tag add/remove/change lines unconditionally with [A], [D], [C] Giuliano Procida via libabigail
2020-01-01  0:00   ` Dodji Seketeli
2020-01-01  0:00   ` [PATCH 2/2 v2] " Giuliano Procida via libabigail
2020-03-17 13:19     ` [PATCH 2/2 v3] " Giuliano Procida
2020-03-18 14:27       ` Dodji Seketeli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).