* 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 56c2448833f539bdc0a19a471a7710e1264a2a4b..17caf5df9b1dea8b887347e9cfebcce5104bc073 100644 (file)
--- 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 877745c546beb89c3d073dd2356333f71575186e..62a50acc93d86eced013d2e950139accb4b13677 100644 (file)
--- 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);