From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 11 Jul 2017 12:28:21 +0000 (+0000)
Subject: * decl2.c (reset_type_linkage_2): Dont't change ctor name.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d988b35c9a330535dda0a46c79f6312fd3f846c6;p=gcc.git

* decl2.c (reset_type_linkage_2): Dont't change ctor name.

From-SVN: r250130
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 56c2448833f..17caf5df9b1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-11  Nathan Sidwell  <nathan@acm.org>
+
+	* decl2.c (reset_type_linkage_2): Dont't change ctor name.
+
 2017-07-10  Martin Sebor  <msebor@redhat.com>
 
 	* cp-tree.h (cp_operator_id, cp_assignment_operator_id): Document.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 877745c546b..62a50acc93d 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2622,13 +2622,6 @@ reset_type_linkage_2 (tree type)
 	{
 	  tree mem = STRIP_TEMPLATE (m);
 	  reset_decl_linkage (mem);
-	  if (DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (mem))
-	    {
-	      /* Also update its name, for cxx_dwarf_name.  */
-	      DECL_NAME (mem) = TYPE_IDENTIFIER (type);
-	      if (m != mem)
-		DECL_NAME (m) = TYPE_IDENTIFIER (type);
-	    }
 	}
       binding_table_foreach (CLASSTYPE_NESTED_UTDS (type),
 			     bt_reset_linkage_2, NULL);