From: Jan Hubicka <hubicka@ucw.cz>
Date: Tue, 19 Jan 2016 11:51:18 +0000 (+0100)
Subject: symtab.c (symtab_node::asm_name): Do not call printable name directly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae4bbcb233b0f9145d8ed56aac835b7eb40d3495;p=gcc.git

symtab.c (symtab_node::asm_name): Do not call printable name directly.

	* symtab.c (symtab_node::asm_name): Do not call printable name directly.
	(symtab_node::name): Report name as unnamed if DECL_NAME is not set.

From-SVN: r232550
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 907a528894b..0272cd34391 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-19  Jan Hubicka  <hubicka@ucw.cz>
+
+	* symtab.c (symtab_node::asm_name): Do not call printable name directly.
+	(symtab_node::name): Report name as unnamed if DECL_NAME is not set.
+
 2016-01-19  Martin Jambor  <mjambor@suse.cz>
 	    Martin Liska  <mliska@suse.cz>
 	    Michael Matz <matz@suse.de>
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 308a489206c..523c95dd29e 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -504,7 +504,7 @@ const char *
 symtab_node::asm_name () const
 {
   if (!DECL_ASSEMBLER_NAME_SET_P (decl))
-    return lang_hooks.decl_printable_name (decl, 2);
+    return name ();
   return IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
 }
 
@@ -513,6 +513,13 @@ symtab_node::asm_name () const
 const char *
 symtab_node::name () const
 {
+  if (!DECL_NAME (decl))
+    {
+      if (DECL_ASSEMBLER_NAME_SET_P (decl))
+	return asm_name ();
+      else
+        return "<unnamed>";
+    }
   return lang_hooks.decl_printable_name (decl, 2);
 }