diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-10-05 10:16:38 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-10-05 10:16:38 +0000 |
| commit | 7a852b59df9f76478b9a3ce8144c0992ef6fc89a (patch) | |
| tree | a4b6385bf05af0518ee08a9c34c010e7418bc8cc /gcc | |
| parent | 8fe3ed4c10e293c69479042667161c79f0accf3e (diff) | |
| download | gcc-7a852b59df9f76478b9a3ce8144c0992ef6fc89a.zip gcc-7a852b59df9f76478b9a3ce8144c0992ef6fc89a.tar.gz gcc-7a852b59df9f76478b9a3ce8144c0992ef6fc89a.tar.bz2 | |
Re: [C++ PATCH] Move mangling alias out of ::
https://gcc.gnu.org/ml/gcc-patches/2017-10/msg00230.html
* decl2.c (record_mangling): Fix spello and formatting from
previous patch.
From-SVN: r253440
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 277b646..fcef8ef 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-10-05 Nathan Sidwell <nathan@acm.org> + + * decl2.c (record_mangling): Fix spello and formatting from + previous patch. + 2017-10-04 Nathan Sidwell <nathan@acm.org> Give builtin types the correct name. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 354d503..3aa2db5 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4377,10 +4377,8 @@ record_mangling (tree decl, bool need_warning) tree *slot = &mangled_decls->get_or_insert (id, &existed); /* If this is already an alias, remove the alias, because the real - decl takes presidence. */ - if (!existed) - ; - else if (DECL_ARTIFICIAL (*slot) && DECL_IGNORED_P (*slot)) + decl takes precedence. */ + if (existed && DECL_ARTIFICIAL (*slot) && DECL_IGNORED_P (*slot)) if (symtab_node *n = symtab_node::get (*slot)) if (n->cpp_implicit_alias) { |