Skip to content

R
riscv-gcc-1
Commit 1377eb9a by Jason Merrill Committed by Jason Merrill
Options

* decl.c (duplicate_decls): Tweak. 

From-SVN: r207198
parent 2e5e7103
Showing with 5 additions and 3 deletions
gcc/cp/ChangeLog
2014-01-28 Jason Merrill <jason@redhat.com>
* decl.c (duplicate_decls): Tweak.
PR c++/53756
* mangle.c (write_unqualified_name): Handle operator auto.
......
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))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment