git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* decl.c (duplicate_decls): Tweak. 

From-SVN: r207198
This commit is contained in:
Jason Merrill 2014-01-28 12:06:47 -05:00 committed by Jason Merrill
parent 2e5e7103a3
commit 1377eb9a03
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/cp/ChangeLog
View File

@ -1,5 +1,7 @@
2014-01-28 Jason Merrill <jason@redhat.com> 2014-01-28 Jason Merrill <jason@redhat.com>
* decl.c (duplicate_decls): Tweak.
PR c++/53756 PR c++/53756
* mangle.c (write_unqualified_name): Handle operator auto. * mangle.c (write_unqualified_name): Handle operator auto.

6
gcc/cp/decl.c
View File

@ -1923,13 +1923,13 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
if (TREE_CODE (newdecl) == FUNCTION_DECL) if (TREE_CODE (newdecl) == FUNCTION_DECL)
maybe_instantiate_noexcept (olddecl); 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 /* For typedefs use the old type, as the new type's DECL_NAME points
at newdecl, which will be ggc_freed. */ at newdecl, which will be ggc_freed. */
if (TREE_CODE (newdecl) == TYPE_DECL) if (TREE_CODE (newdecl) == TYPE_DECL)
newtype = oldtype; 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)) if (VAR_P (newdecl))
{ {