From 1377eb9a039c645be59c3ac3881b97a494d3db53 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 28 Jan 2014 12:06:47 -0500 Subject: [PATCH] * decl.c (duplicate_decls): Tweak. From-SVN: r207198 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/decl.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3da4ab4e1bf..c5e24d929f5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2014-01-28 Jason Merrill + * decl.c (duplicate_decls): Tweak. + PR c++/53756 * mangle.c (write_unqualified_name): Handle operator auto. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c93c7831a08..aca96fcea39 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1923,13 +1923,13 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) if (TREE_CODE (newdecl) == FUNCTION_DECL) maybe_instantiate_noexcept (olddecl); - /* Merge the data types specified in the two decls. */ - newtype = merge_types (TREE_TYPE (newdecl), TREE_TYPE (olddecl)); - /* For typedefs use the old type, as the new type's DECL_NAME points at newdecl, which will be ggc_freed. */ if (TREE_CODE (newdecl) == TYPE_DECL) newtype = oldtype; + else + /* Merge the data types specified in the two decls. */ + newtype = merge_types (TREE_TYPE (newdecl), TREE_TYPE (olddecl)); if (VAR_P (newdecl)) {