naming: emit method type instead of mangled name

The type is more useful and meaningful in the context of virtual methods than
the mangled name.

PiperOrigin-RevId: 608643576
Change-Id: I9fdd9eee4df9ff89eb702b045335c57689ae28b7

21 files changed, 59 insertions, 62 deletions

diff --git a/naming.cc b/naming.cc
index 8cf2c09..f386dce 100644
--- a/naming.cc
+++ b/naming.cc
@@ -174,10 +174,7 @@ Name Describe::operator()(const BaseClass& x) {
 }
 
 Name Describe::operator()(const Method& x) {
-  if (x.mangled_name == x.name) {
-    return Name{x.name};
-  }
-  return Name{x.name + " {" + x.mangled_name + "}"};
+  return (*this)(x.type_id).Add(Side::LEFT, Precedence::ATOMIC, x.name);
 }
 
 Name Describe::operator()(const Member& x) {
diff --git a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_flat b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_flat
index 44fcf2e..b09dbed 100644
--- a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_flat
+++ b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_flat
@@ -21,19 +21,19 @@ function symbol 'void Y::Y(struct Y*)' {_ZN1YC2Ev} changed
       pointed-to type 'struct Y' changed
 
 type 'struct X' changed
-  method 'f {_ZN1X1fEv}' changed
+  method 'int f(struct X*)' changed
     type 'int(struct X*)' changed
       parameter 1 type 'struct X*' changed
         pointed-to type 'struct X' changed
-  method 'g {_ZN1X1gEv}' was added
+  method 'int g(struct X*)' was added
 
 type 'struct Y' changed
   base class 'struct X' changed
     type 'struct X' changed
-  method 'f {_ZN1Y1fEv}' changed
+  method 'int f(struct Y*)' changed
     type 'int(struct Y*)' changed
       parameter 1 type 'struct Y*' changed
         pointed-to type 'struct Y' changed
-  method 'g {_ZN1Y1gEv}' was added
+  method 'int g(struct Y*)' was added
 
 exit code 4
diff --git a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_plain b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_plain
index e59b1f1..295931e 100644
--- a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_plain
+++ b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_plain
@@ -4,12 +4,12 @@ function symbol 'int fun(struct X&)' {_Z3funR1X} changed
   type 'int(struct X&)' changed
     parameter 1 type 'struct X&' changed
       referred-to type 'struct X' changed
-        method 'f {_ZN1X1fEv}' changed
+        method 'int f(struct X*)' changed
           type 'int(struct X*)' changed
             parameter 1 type 'struct X*' changed
               pointed-to type 'struct X' changed
                 (being reported)
-        method 'g {_ZN1X1gEv}' was added
+        method 'int g(struct X*)' was added
 
 function symbol 'void X::X(struct X*)' {_ZN1XC2Ev} changed
   type 'void(struct X*)' changed
@@ -24,12 +24,12 @@ function symbol 'int Y::f(struct Y*)' {_ZN1Y1fEv} changed
         base class 'struct X' changed
           type 'struct X' changed
             (already reported)
-        method 'f {_ZN1Y1fEv}' changed
+        method 'int f(struct Y*)' changed
           type 'int(struct Y*)' changed
             parameter 1 type 'struct Y*' changed
               pointed-to type 'struct Y' changed
                 (being reported)
-        method 'g {_ZN1Y1gEv}' was added
+        method 'int g(struct Y*)' was added
 
 function symbol 'void Y::Y(struct Y*)' {_ZN1YC2Ev} changed
   type 'void(struct Y*)' changed
diff --git a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_small b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_small
index d74df09..1d30f6c 100644
--- a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_small
+++ b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_small
@@ -1,9 +1,9 @@
 function symbol 'int Y::g(struct Y*)' {_ZN1Y1gEv} was added
 
 type 'struct X' changed
-  method 'g {_ZN1X1gEv}' was added
+  method 'int g(struct X*)' was added
 
 type 'struct Y' changed
-  method 'g {_ZN1Y1gEv}' was added
+  method 'int g(struct Y*)' was added
 
 exit code 4
diff --git a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_viz b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_viz
index 4a5a13b..d992e2f 100644
--- a/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_viz
+++ b/test_cases/diff_tests/composite/expected/abstract_base_class_cc.o_o_viz
@@ -6,14 +6,14 @@ digraph "ABI diff" {
   "3" [label="'int(struct X&)'"]
   "4" [label="'struct X&'"]
   "5" [shape=rectangle, label="'struct X'"]
-  "6" [label="'f {_ZN1X1fEv}'"]
+  "6" [label="'int f(struct X*)'"]
   "7" [label="'int(struct X*)'"]
   "8" [label="'struct X*'"]
   "8" -> "5" [label="pointed-to"]
   "7" -> "8" [label="parameter 1"]
   "6" -> "7" [label=""]
   "5" -> "6" [label=""]
-  "9" [color=red, label="added(g {_ZN1X1gEv})"]
+  "9" [color=red, label="added(int g(struct X*))"]
   "5" -> "9" [label=""]
   "4" -> "5" [label="referred-to"]
   "3" -> "4" [label="parameter 1"]
@@ -33,14 +33,14 @@ digraph "ABI diff" {
   "17" [label="'struct X'"]
   "17" -> "5" [label=""]
   "16" -> "17" [label=""]
-  "18" [label="'f {_ZN1Y1fEv}'"]
+  "18" [label="'int f(struct Y*)'"]
   "19" [label="'int(struct Y*)'"]
   "20" [label="'struct Y*'"]
   "20" -> "16" [label="pointed-to"]
   "19" -> "20" [label="parameter 1"]
   "18" -> "19" [label=""]
   "16" -> "18" [label=""]
-  "21" [color=red, label="added(g {_ZN1Y1gEv})"]
+  "21" [color=red, label="added(int g(struct Y*))"]
   "16" -> "21" [label=""]
   "15" -> "16" [label="pointed-to"]
   "14" -> "15" [label="parameter 1"]
diff --git a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_flat b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_flat
index eaf5e18..93280ac 100644
--- a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_flat
+++ b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_flat
@@ -24,21 +24,21 @@ function symbol 'void S::S(struct S*)' {_ZN1SC2Ev} changed
       pointed-to type 'struct S' changed
 
 type 'struct S' changed
-  method 'z {_ZN1S1zEv}' changed
+  method 'void z(struct S*)' changed
     type 'void(struct S*)' changed
       parameter 1 type 'struct S*' changed
         pointed-to type 'struct S' changed
-  method 'y {_ZN1S1yEv}' changed
+  method 'void y(struct S*)' changed
     vtable offset changed from 1 to 2
     type 'void(struct S*)' changed
       parameter 1 type 'struct S*' changed
         pointed-to type 'struct S' changed
-  method 'x {_ZN1S1xEv}' changed
+  method 'void x(struct S*)' changed
     vtable offset changed from 2 to 1
     type 'void(struct S*)' changed
       parameter 1 type 'struct S*' changed
         pointed-to type 'struct S' changed
-  method 'w {_ZN1S1wEv}' changed
+  method 'void w(struct S*)' changed
     type 'void(struct S*)' changed
       parameter 1 type 'struct S*' changed
         pointed-to type 'struct S' changed
diff --git a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_plain b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_plain
index 4b89510..6e0b3db 100644
--- a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_plain
+++ b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_plain
@@ -2,24 +2,24 @@ function symbol 'void S::w(struct S*)' {_ZN1S1wEv} changed
   type 'void(struct S*)' changed
     parameter 1 type 'struct S*' changed
       pointed-to type 'struct S' changed
-        method 'z {_ZN1S1zEv}' changed
+        method 'void z(struct S*)' changed
           type 'void(struct S*)' changed
             parameter 1 type 'struct S*' changed
               pointed-to type 'struct S' changed
                 (being reported)
-        method 'y {_ZN1S1yEv}' changed
+        method 'void y(struct S*)' changed
           vtable offset changed from 1 to 2
           type 'void(struct S*)' changed
             parameter 1 type 'struct S*' changed
               pointed-to type 'struct S' changed
                 (being reported)
-        method 'x {_ZN1S1xEv}' changed
+        method 'void x(struct S*)' changed
           vtable offset changed from 2 to 1
           type 'void(struct S*)' changed
             parameter 1 type 'struct S*' changed
               pointed-to type 'struct S' changed
                 (being reported)
-        method 'w {_ZN1S1wEv}' changed
+        method 'void w(struct S*)' changed
           type 'void(struct S*)' changed
             parameter 1 type 'struct S*' changed
               pointed-to type 'struct S' changed
diff --git a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_small b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_small
index a070764..079c5bc 100644
--- a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_small
+++ b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_small
@@ -1,7 +1,7 @@
 type 'struct S' changed
-  method 'y {_ZN1S1yEv}' changed
+  method 'void y(struct S*)' changed
     vtable offset changed from 1 to 2
-  method 'x {_ZN1S1xEv}' changed
+  method 'void x(struct S*)' changed
     vtable offset changed from 2 to 1
 
 exit code 4
diff --git a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_viz b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_viz
index 9cfd31f..83e611d 100644
--- a/test_cases/diff_tests/composite/expected/method_order_cc.o_o_viz
+++ b/test_cases/diff_tests/composite/expected/method_order_cc.o_o_viz
@@ -4,28 +4,28 @@ digraph "ABI diff" {
   "2" [label="'void(struct S*)'"]
   "3" [label="'struct S*'"]
   "4" [shape=rectangle, label="'struct S'"]
-  "5" [label="'z {_ZN1S1zEv}'"]
+  "5" [label="'void z(struct S*)'"]
   "6" [label="'void(struct S*)'"]
   "7" [label="'struct S*'"]
   "7" -> "4" [label="pointed-to"]
   "6" -> "7" [label="parameter 1"]
   "5" -> "6" [label=""]
   "4" -> "5" [label=""]
-  "8" [color=red, label="'y {_ZN1S1yEv}'"]
+  "8" [color=red, label="'void y(struct S*)'"]
   "8" -> "8:0"
   "8:0" [color=red, label="vtable offset changed from 1 to 2"]
   "9" [label="'void(struct S*)'"]
   "9" -> "7" [label="parameter 1"]
   "8" -> "9" [label=""]
   "4" -> "8" [label=""]
-  "10" [color=red, label="'x {_ZN1S1xEv}'"]
+  "10" [color=red, label="'void x(struct S*)'"]
   "10" -> "10:0"
   "10:0" [color=red, label="vtable offset changed from 2 to 1"]
   "11" [label="'void(struct S*)'"]
   "11" -> "7" [label="parameter 1"]
   "10" -> "11" [label=""]
   "4" -> "10" [label=""]
-  "12" [label="'w {_ZN1S1wEv}'"]
+  "12" [label="'void w(struct S*)'"]
   "13" [label="'void(struct S*)'"]
   "13" -> "7" [label="parameter 1"]
   "12" -> "13" [label=""]
diff --git a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_flat b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_flat
index 44fcf2e..b09dbed 100644
--- a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_flat
+++ b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_flat
@@ -21,19 +21,19 @@ function symbol 'void Y::Y(struct Y*)' {_ZN1YC2Ev} changed
       pointed-to type 'struct Y' changed
 
 type 'struct X' changed
-  method 'f {_ZN1X1fEv}' changed
+  method 'int f(struct X*)' changed
     type 'int(struct X*)' changed
       parameter 1 type 'struct X*' changed
         pointed-to type 'struct X' changed
-  method 'g {_ZN1X1gEv}' was added
+  method 'int g(struct X*)' was added
 
 type 'struct Y' changed
   base class 'struct X' changed
     type 'struct X' changed
-  method 'f {_ZN1Y1fEv}' changed
+  method 'int f(struct Y*)' changed
     type 'int(struct Y*)' changed
       parameter 1 type 'struct Y*' changed
         pointed-to type 'struct Y' changed
-  method 'g {_ZN1Y1gEv}' was added
+  method 'int g(struct Y*)' was added
 
 exit code 4
diff --git a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_plain b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_plain
index e59b1f1..295931e 100644
--- a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_plain
+++ b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_plain
@@ -4,12 +4,12 @@ function symbol 'int fun(struct X&)' {_Z3funR1X} changed
   type 'int(struct X&)' changed
     parameter 1 type 'struct X&' changed
       referred-to type 'struct X' changed
-        method 'f {_ZN1X1fEv}' changed
+        method 'int f(struct X*)' changed
           type 'int(struct X*)' changed
             parameter 1 type 'struct X*' changed
               pointed-to type 'struct X' changed
                 (being reported)
-        method 'g {_ZN1X1gEv}' was added
+        method 'int g(struct X*)' was added
 
 function symbol 'void X::X(struct X*)' {_ZN1XC2Ev} changed
   type 'void(struct X*)' changed
@@ -24,12 +24,12 @@ function symbol 'int Y::f(struct Y*)' {_ZN1Y1fEv} changed
         base class 'struct X' changed
           type 'struct X' changed
             (already reported)
-        method 'f {_ZN1Y1fEv}' changed
+        method 'int f(struct Y*)' changed
           type 'int(struct Y*)' changed
             parameter 1 type 'struct Y*' changed
               pointed-to type 'struct Y' changed
                 (being reported)
-        method 'g {_ZN1Y1gEv}' was added
+        method 'int g(struct Y*)' was added
 
 function symbol 'void Y::Y(struct Y*)' {_ZN1YC2Ev} changed
   type 'void(struct Y*)' changed
diff --git a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_small b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_small
index d74df09..1d30f6c 100644
--- a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_small
+++ b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_small
@@ -1,9 +1,9 @@
 function symbol 'int Y::g(struct Y*)' {_ZN1Y1gEv} was added
 
 type 'struct X' changed
-  method 'g {_ZN1X1gEv}' was added
+  method 'int g(struct X*)' was added
 
 type 'struct Y' changed
-  method 'g {_ZN1Y1gEv}' was added
+  method 'int g(struct Y*)' was added
 
 exit code 4
diff --git a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_viz b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_viz
index 4a5a13b..d992e2f 100644
--- a/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_viz
+++ b/test_cases/diff_tests/composite/expected/virtual_only_base_class_cc.o_o_viz
@@ -6,14 +6,14 @@ digraph "ABI diff" {
   "3" [label="'int(struct X&)'"]
   "4" [label="'struct X&'"]
   "5" [shape=rectangle, label="'struct X'"]
-  "6" [label="'f {_ZN1X1fEv}'"]
+  "6" [label="'int f(struct X*)'"]
   "7" [label="'int(struct X*)'"]
   "8" [label="'struct X*'"]
   "8" -> "5" [label="pointed-to"]
   "7" -> "8" [label="parameter 1"]
   "6" -> "7" [label=""]
   "5" -> "6" [label=""]
-  "9" [color=red, label="added(g {_ZN1X1gEv})"]
+  "9" [color=red, label="added(int g(struct X*))"]
   "5" -> "9" [label=""]
   "4" -> "5" [label="referred-to"]
   "3" -> "4" [label="parameter 1"]
@@ -33,14 +33,14 @@ digraph "ABI diff" {
   "17" [label="'struct X'"]
   "17" -> "5" [label=""]
   "16" -> "17" [label=""]
-  "18" [label="'f {_ZN1Y1fEv}'"]
+  "18" [label="'int f(struct Y*)'"]
   "19" [label="'int(struct Y*)'"]
   "20" [label="'struct Y*'"]
   "20" -> "16" [label="pointed-to"]
   "19" -> "20" [label="parameter 1"]
   "18" -> "19" [label=""]
   "16" -> "18" [label=""]
-  "21" [color=red, label="added(g {_ZN1Y1gEv})"]
+  "21" [color=red, label="added(int g(struct Y*))"]
   "16" -> "21" [label=""]
   "15" -> "16" [label="pointed-to"]
   "14" -> "15" [label="parameter 1"]
diff --git a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_flat b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_flat
index 3c60239..e81dc6d 100644
--- a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_flat
+++ b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_flat
@@ -30,14 +30,14 @@ variable symbol 'struct VirtualToStatic virtual_to_static' changed
 
 type 'struct StaticToVirtual' changed
   byte size changed from 4 to 16
-  method 'print {_ZN15StaticToVirtual5printEv}' was added
+  method 'int print(struct StaticToVirtual*)' was added
   member 'int(** _vptr$StaticToVirtual)()' was added
   member 'int m' changed
     offset changed from 0 to 64
 
 type 'struct VirtualToStatic' changed
   byte size changed from 16 to 4
-  method 'print {_ZN15VirtualToStatic5printEv}' was removed
+  method 'int print(struct VirtualToStatic*)' was removed
   member 'int(** _vptr$VirtualToStatic)()' was removed
   member 'int m' changed
     offset changed from 64 to 0
diff --git a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_plain b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_plain
index 1e12099..ffd606e 100644
--- a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_plain
+++ b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_plain
@@ -25,7 +25,7 @@ function symbol changed from 'int VirtualToStatic::print(struct VirtualToStatic*
 variable symbol 'struct StaticToVirtual static_to_virtual' changed
   type 'struct StaticToVirtual' changed
     byte size changed from 4 to 16
-    method 'print {_ZN15StaticToVirtual5printEv}' was added
+    method 'int print(struct StaticToVirtual*)' was added
     member 'int(** _vptr$StaticToVirtual)()' was added
     member 'int m' changed
       offset changed from 0 to 64
@@ -33,7 +33,7 @@ variable symbol 'struct StaticToVirtual static_to_virtual' changed
 variable symbol 'struct VirtualToStatic virtual_to_static' changed
   type 'struct VirtualToStatic' changed
     byte size changed from 16 to 4
-    method 'print {_ZN15VirtualToStatic5printEv}' was removed
+    method 'int print(struct VirtualToStatic*)' was removed
     member 'int(** _vptr$VirtualToStatic)()' was removed
     member 'int m' changed
       offset changed from 64 to 0
diff --git a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_small b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_small
index 7ddaeca..6990549 100644
--- a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_small
+++ b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_small
@@ -24,14 +24,14 @@ function symbol changed from 'int VirtualToStatic::print(struct VirtualToStatic*
 
 type 'struct StaticToVirtual' changed
   byte size changed from 4 to 16
-  method 'print {_ZN15StaticToVirtual5printEv}' was added
+  method 'int print(struct StaticToVirtual*)' was added
   member 'int(** _vptr$StaticToVirtual)()' was added
   member 'int m' changed
     offset changed from 0 to 64
 
 type 'struct VirtualToStatic' changed
   byte size changed from 16 to 4
-  method 'print {_ZN15VirtualToStatic5printEv}' was removed
+  method 'int print(struct VirtualToStatic*)' was removed
   member 'int(** _vptr$VirtualToStatic)()' was removed
   member 'int m' changed
     offset changed from 64 to 0
diff --git a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_viz b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_viz
index 726cef5..e25534e 100644
--- a/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_viz
+++ b/test_cases/diff_tests/function/expected/static_vs_virtual_cc.o_o_viz
@@ -32,7 +32,7 @@ digraph "ABI diff" {
   "16" [color=red, shape=rectangle, label="'struct StaticToVirtual'"]
   "16" -> "16:0"
   "16:0" [color=red, label="byte size changed from 4 to 16"]
-  "17" [color=red, label="added(print {_ZN15StaticToVirtual5printEv})"]
+  "17" [color=red, label="added(int print(struct StaticToVirtual*))"]
   "16" -> "17" [label=""]
   "18" [color=red, label="added(int(** _vptr$StaticToVirtual)())"]
   "16" -> "18" [label=""]
@@ -46,7 +46,7 @@ digraph "ABI diff" {
   "21" [color=red, shape=rectangle, label="'struct VirtualToStatic'"]
   "21" -> "21:0"
   "21:0" [color=red, label="byte size changed from 16 to 4"]
-  "22" [color=red, label="removed(print {_ZN15VirtualToStatic5printEv})"]
+  "22" [color=red, label="removed(int print(struct VirtualToStatic*))"]
   "21" -> "22" [label=""]
   "23" [color=red, label="removed(int(** _vptr$VirtualToStatic)())"]
   "21" -> "23" [label=""]
diff --git a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_flat b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_flat
index caf059b..63fa50e 100644
--- a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_flat
+++ b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_flat
@@ -28,12 +28,12 @@ variable symbol 'struct VirtualToNormal virtual_to_normal' changed
 
 type 'struct NormalToVirtual' changed
   byte size changed from 1 to 8
-  method 'print {_ZN15NormalToVirtual5printEv}' was added
+  method 'void print(struct NormalToVirtual*)' was added
   member 'int(** _vptr$NormalToVirtual)()' was added
 
 type 'struct VirtualToNormal' changed
   byte size changed from 8 to 1
-  method 'print {_ZN15VirtualToNormal5printEv}' was removed
+  method 'void print(struct VirtualToNormal*)' was removed
   member 'int(** _vptr$VirtualToNormal)()' was removed
 
 exit code 4
diff --git a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_plain b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_plain
index 9ac92fd..1aabae0 100644
--- a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_plain
+++ b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_plain
@@ -15,7 +15,7 @@ function symbol 'void NormalToVirtual::print(struct NormalToVirtual*)' {_ZN15Nor
     parameter 1 type 'struct NormalToVirtual*' changed
       pointed-to type 'struct NormalToVirtual' changed
         byte size changed from 1 to 8
-        method 'print {_ZN15NormalToVirtual5printEv}' was added
+        method 'void print(struct NormalToVirtual*)' was added
         member 'int(** _vptr$NormalToVirtual)()' was added
 
 function symbol 'void VirtualToNormal::print(struct VirtualToNormal*)' {_ZN15VirtualToNormal5printEv} changed
@@ -23,7 +23,7 @@ function symbol 'void VirtualToNormal::print(struct VirtualToNormal*)' {_ZN15Vir
     parameter 1 type 'struct VirtualToNormal*' changed
       pointed-to type 'struct VirtualToNormal' changed
         byte size changed from 8 to 1
-        method 'print {_ZN15VirtualToNormal5printEv}' was removed
+        method 'void print(struct VirtualToNormal*)' was removed
         member 'int(** _vptr$VirtualToNormal)()' was removed
 
 variable symbol 'struct NormalToVirtual normal_to_virtual' changed
diff --git a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_small b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_small
index 3fb8baf..d5757f7 100644
--- a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_small
+++ b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_small
@@ -12,12 +12,12 @@ variable symbol '_ZTV15NormalToVirtual' was added
 
 type 'struct NormalToVirtual' changed
   byte size changed from 1 to 8
-  method 'print {_ZN15NormalToVirtual5printEv}' was added
+  method 'void print(struct NormalToVirtual*)' was added
   member 'int(** _vptr$NormalToVirtual)()' was added
 
 type 'struct VirtualToNormal' changed
   byte size changed from 8 to 1
-  method 'print {_ZN15VirtualToNormal5printEv}' was removed
+  method 'void print(struct VirtualToNormal*)' was removed
   member 'int(** _vptr$VirtualToNormal)()' was removed
 
 exit code 4
diff --git a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_viz b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_viz
index 16fe4c0..e315dce 100644
--- a/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_viz
+++ b/test_cases/diff_tests/function/expected/virtual_vs_non_virtual_cc.o_o_viz
@@ -18,7 +18,7 @@ digraph "ABI diff" {
   "10" [color=red, shape=rectangle, label="'struct NormalToVirtual'"]
   "10" -> "10:0"
   "10:0" [color=red, label="byte size changed from 1 to 8"]
-  "11" [color=red, label="added(print {_ZN15NormalToVirtual5printEv})"]
+  "11" [color=red, label="added(void print(struct NormalToVirtual*))"]
   "10" -> "11" [label=""]
   "12" [color=red, label="added(int(** _vptr$NormalToVirtual)())"]
   "10" -> "12" [label=""]
@@ -32,7 +32,7 @@ digraph "ABI diff" {
   "16" [color=red, shape=rectangle, label="'struct VirtualToNormal'"]
   "16" -> "16:0"
   "16:0" [color=red, label="byte size changed from 8 to 1"]
-  "17" [color=red, label="removed(print {_ZN15VirtualToNormal5printEv})"]
+  "17" [color=red, label="removed(void print(struct VirtualToNormal*))"]
   "16" -> "17" [label=""]
   "18" [color=red, label="removed(int(** _vptr$VirtualToNormal)())"]
   "16" -> "18" [label=""]