diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 07f82ad97af..214cb579ff4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2014-01-27 Jason Merrill <jason@redhat.com> + PR c++/54652 + * decl.c (duplicate_decls): Always use oldtype for TYPE_DECL. + PR c++/58504 * pt.c (tsubst_copy_and_build) [TRAIT_EXPR]: Use tsubst for types. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 7ebb05d451c..c93c7831a08 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1926,9 +1926,9 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) /* Merge the data types specified in the two decls. */ newtype = merge_types (TREE_TYPE (newdecl), TREE_TYPE (olddecl)); - /* If merge_types produces a non-typedef type, just use the old type. */ - if (TREE_CODE (newdecl) == TYPE_DECL - && newtype == DECL_ORIGINAL_TYPE (newdecl)) + /* 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; if (VAR_P (newdecl)) |