optinfo-emit-json.cc: don't call get_fnname_from_decl (PR middle-end/89725)

optrecord_json_writer::optinfo_to_json can in theory be called from any
optimization pass, but currently uses get_fnname_from_decl, which
is RTL-specific.

In that PR, Jakub suggested using either DECL_ASSEMBLER_NAME or the
"printable name" (via current_function_name).

This patch makes it use DECL_ASSEMBLER_NAME.

gcc/ChangeLog:
	PR middle-end/89725
	* optinfo-emit-json.cc (optrecord_json_writer::optinfo_to_json):
	Use DECL_ASSEMBLER_NAME rather than get_fnname_from_decl.

From-SVN: r269994

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50ed3df17574fd85023a82f9a244fcbddbaafcd3..741639daa126795bc709416eee47bc6bbc702e70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-28  David Malcolm  <dmalcolm@redhat.com>
+
+       PR middle-end/89725
+       * optinfo-emit-json.cc (optrecord_json_writer::optinfo_to_json):
+       Use DECL_ASSEMBLER_NAME rather than get_fnname_from_decl.
+
 2019-03-28  Jakub Jelinek  <jakub@redhat.com>
 
        * regcprop.c (copyprop_hardreg_forward_1): Remove redundant INSN_P

diff --git a/gcc/optinfo-emit-json.cc b/gcc/optinfo-emit-json.cc
index 814446b2209fe6cb8fb65a3a35aa2c2280d8648a..1cfcdfe8948be57e86602175082b498640368270 100644 (file)
--- a/gcc/optinfo-emit-json.cc
+++ b/gcc/optinfo-emit-json.cc
@@ -411,7 +411,8 @@ optrecord_json_writer::optinfo_to_json (const optinfo *optinfo)
 
   if (current_function_decl)
     {
-      const char *fnname = get_fnname_from_decl (current_function_decl);
+      const char *fnname
+       = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl));
       obj->set ("function", new json::string (fnname));
     }