diff mbox series

[2/2] Tag add/remove/change lines unconditionally with [A], [D], [C].

Message ID 20200305160317.101386-2-gprocida@google.com
State Committed
Headers show
Series [1/2] Add space missing between "[C]" tag and description of changed item. | expand

Commit Message

Matthias Maennich via libabigail Jan. 1, 2020, midnight UTC
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 mbox series

Patch

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'===============